Dolibarr / dolibarr

htdocs/contrat/ticket.php

Spacing +32 added lines, -32 removed lines

@@ -37,10 +37,10 @@ 
 
 $langs->loadLangs(array('companies', 'contracts', 'tickets'));
 
-$socid=GETPOST('socid', 'int');
-$id=GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
+$socid = GETPOST('socid', 'int');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 if ($id == '' && $ref == '') {
 	dol_print_error('', 'Bad parameter');
@@ -48,11 +48,11 @@ 
 }
 
 // Security check
-$socid=0;
+$socid = 0;
 if ($user->socid > 0)
-	$socid=$user->socid;
+	$socid = $user->socid;
 
-$result=restrictedArea($user, 'contrat', $id);
+$result = restrictedArea($user, 'contrat', $id);
 
 
 /*
@@ -62,62 +62,62 @@ 
 llxHeader("", $langs->trans("Tickets"), "Contrat");
 
 $form = new Form($db);
-$userstatic=new User($db);
+$userstatic = new User($db);
 
-$object= new Contrat($db);
-$result=$object->fetch($id, $ref);
-$ret=$object->fetch_thirdparty();
+$object = new Contrat($db);
+$result = $object->fetch($id, $ref);
+$ret = $object->fetch_thirdparty();
 $head = contract_prepare_head($object);
 
 
 dol_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">';
-$linkback.= $langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">';
+$linkback .= $langs->trans("BackToList").'</a>';
 
-$morehtmlref='';
-$morehtmlref.=$object->ref;
+$morehtmlref = '';
+$morehtmlref .= $object->ref;
 
-$morehtmlref.='<div class="refidno">';
+$morehtmlref .= '<div class="refidno">';
 // Ref customer
-$morehtmlref.=$form->editfieldkey(
+$morehtmlref .= $form->editfieldkey(
 				"RefCustomer", 'ref_customer', $object->ref_customer,
 				$object, 0, 'string', '', 0, 1
 );
-$morehtmlref.=$form->editfieldval(
+$morehtmlref .= $form->editfieldval(
 				"RefCustomer", 'ref_customer', $object->ref_customer,
 				$object, 0, 'string', '', null, null, '', 1
 );
 // Ref supplier
-$morehtmlref.='<br>';
-$morehtmlref.=$form->editfieldkey(
+$morehtmlref .= '<br>';
+$morehtmlref .= $form->editfieldkey(
 				"RefSupplier", 'ref_supplier', $object->ref_supplier,
 				$object, 0, 'string', '', 0, 1
 );
-$morehtmlref.=$form->editfieldval(
+$morehtmlref .= $form->editfieldval(
 				"RefSupplier", 'ref_supplier', $object->ref_supplier,
 				$object, 0, 'string', '', null, null, '', 1
 );
 // Thirdparty
-$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 	$langs->load("projects");
-	$morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
-	if (! empty($object->fk_project)) {
+	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
+	if (!empty($object->fk_project)) {
 		$proj = new Project($db);
 		$proj->fetch($object->fk_project);
-		$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=';
-		$morehtmlref.=$object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-		$morehtmlref.=$proj->ref;
-		$morehtmlref.='</a>';
+		$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id=';
+		$morehtmlref .= $object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+		$morehtmlref .= $proj->ref;
+		$morehtmlref .= '</a>';
 	} else {
-		$morehtmlref.='';
+		$morehtmlref .= '';
 	}
 }
-$morehtmlref.='</div>';
+$morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
@@ -128,7 +128,7 @@ 
  * Referers types
  */
 
-$title=$langs->trans("ListTicketsLinkToContract");
+$title = $langs->trans("ListTicketsLinkToContract");
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';

Braces +2 added lines, -1 removed lines

@@ -49,8 +49,9 @@
 
 // Security check
 $socid=0;
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	$socid=$user->socid;
+}
 
 $result=restrictedArea($user, 'contrat', $id);
 

htdocs/install/repair.php

Spacing +6 added lines, -6 removed lines

@@ -1155,7 +1155,7 @@ 
 									$result = 'found'; // If error, we force like if we found to avoid any deletion
 								}
 							} else {
-								$result = 'found';	//
+								$result = 'found'; //
 							}
 
 							if (!$result) {
@@ -1525,16 +1525,16 @@ 
 
 // Repair llx_commande_fournisseur to eleminate duplicate reference
 if ($ok && GETPOST('repair_supplier_order_duplicate_ref')) {
-	require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
-	include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 	$db->begin();
 
 	$err = 0;
 
 	// Query to find all duplicate supplier orders
-	$sql = "SELECT * FROM " . MAIN_DB_PREFIX . "commande_fournisseur";
-	$sql .= " WHERE ref IN (SELECT cf.ref FROM " . MAIN_DB_PREFIX . "commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)";
+	$sql = "SELECT * FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+	$sql .= " WHERE ref IN (SELECT cf.ref FROM ".MAIN_DB_PREFIX."commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)";
 
 	// Build a list of ref => []CommandeFournisseur
 	$duplicateSupplierOrders = [];
@@ -1560,7 +1560,7 @@ 
 
 			$newRef = $supplierOrder->getNextNumRef($soc);
 
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "commande_fournisseur cf SET cf.ref = '" . $db->escape($newRef) . "' WHERE cf.rowid = " . (int) $supplierOrder->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur cf SET cf.ref = '".$db->escape($newRef)."' WHERE cf.rowid = ".(int) $supplierOrder->id;
 			if (!$db->query($sql)) {
 				$err++;
 			}

htdocs/install/doctemplates/websites/website_template-noimg/containers/manifest.json.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();

htdocs/install/doctemplates/websites/website_template-noimg/containers/index.php

Braces +5 added lines, -1 removed lines

@@ -1,4 +1,8 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page80.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page80.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page80.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page80.tpl.php';
+}

htdocs/install/doctemplates/websites/website_template-noimg/containers/master.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+	if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	if (! defined('USEEXTERNALSERVER')) {
+		define('USEEXTERNALSERVER', 1);
+	}
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/install/doctemplates/websites/website_template-noimg/containers/page80.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
 } // Not already loaded

Braces +7 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
+	$websitepagefile=__FILE__;
+}
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
@@ -26,7 +28,10 @@ 
 <!-- Include link to JS file -->
 <script async src="/javascript.js.php"></script>
 <!-- Include HTML header from common file -->
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
+}
+?>
 <!-- Include HTML header from page header block -->
 <head>
 		<meta charset="UTF-8" />

htdocs/install/doctemplates/websites/website_template-noimg/containers/styles.css.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php // BEGIN PHP
-$websitekey=basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
+$websitekey = basename(__DIR__);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
-if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
+if (!headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
 	header('Cache-Control: max-age=3600, public, must-revalidate');
 	header('Content-type: text/css');
 }

htdocs/install/doctemplates/websites/website_template-restaurant/containers/contact.php

Braces +5 added lines, -1 removed lines

@@ -1,5 +1,9 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page249.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page249.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page249.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page249.tpl.php';
+}
 ?>

htdocs/install/doctemplates/websites/website_template-restaurant/containers/footer.php

Braces +5 added lines, -1 removed lines

@@ -1,5 +1,9 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page252.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page252.tpl.php';
+if (empty($dolibarr_main_data_root)) {
+	require './page252.tpl.php';
+} else {
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page252.tpl.php';
+}
 ?>