Dolibarr / dolibarr

htdocs/don/payment/card.php

Spacing +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
 		if (!$disable_delete) {
 			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', 1);
 		} else {
-			print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, [ 'attr' => ['classOverride' => 'butActionRefused']]);
+			print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, ['attr' => ['classOverride' => 'butActionRefused']]);
 		}
 	}
 }

htdocs/accountancy/tpl/export_journal.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -72,5 +72,5 @@
 }
 
 if (empty($downloadMode)) {
-	header('Content-Disposition: attachment;filename=' . $completefilename);
+	header('Content-Disposition: attachment;filename='.$completefilename);
 }

htdocs/accountancy/admin/card.php

Spacing +14 added lines, -14 removed lines

@@ -76,9 +76,9 @@ 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 		} else {
-			$sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
+			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
 
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
 			$result = $db->query($sql);
 			$obj = $db->fetch_object($result);
 
@@ -123,7 +123,7 @@ 
 			if (!$error) {
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
 				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
-				header("Location: " . $urltogo);
+				header("Location: ".$urltogo);
 				exit;
 			}
 		}
@@ -141,7 +141,7 @@ 
 
 			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
 
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
 			$result2 = $db->query($sql);
 			$obj = $db->fetch_object($result2);
 
@@ -171,8 +171,8 @@ 
 			$result = $object->update($user);
 
 			if ($result > 0) {
-				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
-				header("Location: " . $urltogo);
+				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+				header("Location: ".$urltogo);
 				exit();
 			} elseif ($result == -2) {
 				setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors');
@@ -264,14 +264,14 @@ 
 	print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 	// autosuggest from existing account types if found
 	print '<datalist id="pcg_type_datalist">';
-	$sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account";
-	$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+	$sql = "SELECT DISTINCT pcg_type FROM ".MAIN_DB_PREFIX."accounting_account";
+	$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
+	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
 	$sql .= ' LIMIT 50000'; // just as a sanity check
 	$resql = $db->query($sql);
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
-			print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+			print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
 		}
 	}
 	print '</datalist>';
@@ -341,14 +341,14 @@ 
 			print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 			// autosuggest from existing account types if found
 			print '<datalist id="pcg_type_datalist">';
-			$sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
-			$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+			$sql = 'SELECT DISTINCT pcg_type FROM '.MAIN_DB_PREFIX.'accounting_account';
+			$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
+			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
 			$sql .= ' LIMIT 50000'; // just as a sanity check
 			$resql = $db->query($sql);
 			if ($resql) {
 				while ($obj = $db->fetch_object($resql)) {
-					print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+					print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
 				}
 			}
 			print '</datalist>';

htdocs/compta/tva/card.php

Spacing +5 added lines, -5 removed lines

@@ -252,7 +252,7 @@ 
 				}
 			}
 			if (empty($error)) {
-				header("Location: card.php?id=" . $object->id);
+				header("Location: card.php?id=".$object->id);
 				exit;
 			}
 		}
@@ -307,7 +307,7 @@ 
 		} else {
 			$result = $object->fetch($id);
 
-			$object->amount	= $amount;
+			$object->amount = $amount;
 
 			$result = $object->update($user);
 			if ($result <= 0) {
@@ -469,7 +469,7 @@ 
 
 	// Auto create payment
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n";
 
 	print '<tr class="hide_if_no_auto_create_payment">';
 	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
@@ -609,9 +609,9 @@ 
 	print '</td></tr>';
 
 	if ($action == 'edit') {
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 	}
 
 	// Mode of payment

htdocs/compta/bank/class/paymentvarious.class.php

Spacing +2 added lines, -2 removed lines

@@ -306,7 +306,7 @@ 
 				$this->type_payment         = $obj->fk_typepayment;
 				$this->num_payment          = $obj->num_payment;
 				$this->label                = $obj->label;
-				$this->note                 = $obj->note_private;	// For backward compatibility
+				$this->note                 = $obj->note_private; // For backward compatibility
 				$this->note_private         = $obj->note_private;
 				$this->subledger_account    = $obj->subledger_account;
 				$this->accountancy_code     = $obj->accountancy_code;
@@ -486,7 +486,7 @@ 
 		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
 		$sql .= ", ".((int) $user->id);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", NULL";	// Filled later
+		$sql .= ", NULL"; // Filled later
 		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 

htdocs/compta/prelevement/class/ligneprelevement.class.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
 
 	const STATUS_DRAFT = 0;
 	const STATUS_NOT_USED = 1;
-	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
-	const STATUS_DEBITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
 	const STATUS_REJECTED = 3;
 
 

htdocs/user/passwordforgotten.php

Spacing +2 added lines, -2 removed lines

@@ -142,12 +142,12 @@
 			$messagewarning .= '</div>';
 
 			if ($result <= 0 && $edituser->error == 'USERNOTFOUND') {
-				usleep(20000);	// add delay to simulate setPassword() and send_password() actions delay (0.02s)
+				usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s)
 				$message .= $messagewarning;
 				$username = '';
 			} else {
 				if (empty($edituser->email)) {
-					usleep(20000);	// add delay to simulate setPassword() and send_password() actions delay (0.02s)
+					usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s)
 					$message .= $messagewarning;
 				} else {
 					$newpassword = $edituser->setPassword($user, '', 1);

htdocs/admin/const.php

Spacing +5 added lines, -5 removed lines

@@ -199,12 +199,12 @@ 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '') . "\n";
+print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n";
 print getTitleFieldOfList("Value", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 print getTitleFieldOfList("Comment", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";
+print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 if (isModEnabled('multicompany') && !$user->entity) {
-	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";
+	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 }
 print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 print "</tr>\n";
@@ -227,12 +227,12 @@ 
 // Limit to superadmin
 if (isModEnabled('multicompany') && !$user->entity) {
 	print '<td>';
-	print '<input type="text" class="flat" size="1" name="entity" value="' . $conf->entity . '">';
+	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
 	print '<td class="center">';
 } else {
 	print '<td class="center">';
-	print '<input type="hidden" name="entity" value="' . $conf->entity . '">';
+	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
 print '<input type="submit" class="button button-add small" id="add" name="add" value="'.$langs->trans("Add").'">';
 print "</td>\n";

htdocs/includes/odtphp/zip/PclZipProxy.php

Indentation +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@
 	protected $openned = false;
 	protected $filename;
 	protected $pclzip;
-    /**
-     * Class constructor
-     *
-     * @throws PclZipProxyException
-     */
+	/**
+	 * Class constructor
+	 *
+	 * @throws PclZipProxyException
+	 */
 	public function __construct($forcedir='')
 	{
 		if (! class_exists('PclZip')) {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 			|| !file_exists($filename)) {
 			return false;
 		}
-		if (isSet($localname)) {
+		if (isset($localname)) {
 			$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 			$localpath = dirname($localname);
 			$tmpfilename = $this->tmpdir . '/' . basename($localname);

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('ODTPHP_PATHTOPCLZIP')) {
+if (!defined('ODTPHP_PATHTOPCLZIP')) {
 	define('ODTPHP_PATHTOPCLZIP', DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/');
 }
 require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php';
@@ -28,13 +28,13 @@ 
      *
      * @throws PclZipProxyException
      */
-	public function __construct($forcedir='')
+	public function __construct($forcedir = '')
 	{
-		if (! class_exists('PclZip')) {
+		if (!class_exists('PclZip')) {
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) $this->tmpdir = preg_replace('|[//\/]$|', '', $forcedir); // $this->tmpdir must not contains / at the end
 	}
 
 	/**
@@ -91,11 +91,11 @@ 
 		}
 		$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 		$localpath = dirname($localname);
-		$tmpfilename = $this->tmpdir . '/' . basename($localname);
+		$tmpfilename = $this->tmpdir.'/'.basename($localname);
 		if (false !== file_put_contents($tmpfilename, $contents)) {
 			//print "tmpfilename=".$tmpfilename;
 			//print "localname=".$localname;
-			$res=$this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname);
+			$res = $this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname);
 			$add = $this->pclzip->add($tmpfilename,
 				PCLZIP_OPT_REMOVE_PATH, $this->tmpdir,
 				PCLZIP_OPT_ADD_PATH, $localpath);
@@ -126,10 +126,10 @@ 
 		if (isSet($localname)) {
 			$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 			$localpath = dirname($localname);
-			$tmpfilename = $this->tmpdir . '/' . basename($localname);
+			$tmpfilename = $this->tmpdir.'/'.basename($localname);
 		} else {
 			$localname = basename($filename);
-			$tmpfilename = $this->tmpdir . '/' . $localname;
+			$tmpfilename = $this->tmpdir.'/'.$localname;
 			$localpath = '';
 		}
 		if (file_exists($filename)) {

Braces +4 added lines, -1 removed lines

@@ -34,7 +34,10 @@
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) {
+			$this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);
+		}
+		// $this->tmpdir must not contains / at the end
 	}
 
 	/**