Dolibarr / dolibarr

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/master.inc.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?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);
-    require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
+	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?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 '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?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 '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

htdocs/install/doctemplates/websites/website_template-restaurant/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-stellar/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 '/home/ldestailleur/git/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 '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/adherents/index.php

Spacing +6 added lines, -6 removed lines

@@ -93,10 +93,10 @@ 
 	$year = date('Y');
 	$numberyears = getDolGlobalInt("MAIN_NB_OF_YEAR_IN_MEMBERSHIP_WIDGET_GRAPH");
 
-	$boxgraph .='<div class="div-table-responsive-no-min">';
-	$boxgraph .='<table class="noborder nohover centpercent">';
-	$boxgraph .='<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year-$numberyears).' - '.$year.')' : '').'</th></tr>';
-	$boxgraph .='<tr><td class="center" colspan="2">';
+	$boxgraph .= '<div class="div-table-responsive-no-min">';
+	$boxgraph .= '<table class="noborder nohover centpercent">';
+	$boxgraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'</th></tr>';
+	$boxgraph .= '<tr><td class="center" colspan="2">';
 
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
 	$stats = new AdherentStats($db, 0, $userid);
@@ -115,7 +115,7 @@ 
 	}
 
 	$dataseries = array();
-	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']);			// Draft, not yet validated
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']); // Draft, not yet validated
 	$dataseries[] = array($langs->transnoentitiesnoconv("WaitingSubscription"), $sumMembers['total']['members_pending']);
 	$dataseries[] = array($langs->transnoentitiesnoconv("UpToDate"), $sumMembers['total']['members_uptodate']);
 	$dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), $sumMembers['total']['members_expired']);
@@ -133,7 +133,7 @@ 
 	$dolgraph->SetType(array('pie'));
 	$dolgraph->setHeight('200');
 	$dolgraph->draw('idgraphstatus');
-	$boxgraph .=$dolgraph->show($total ? 0 : 1);
+	$boxgraph .= $dolgraph->show($total ? 0 : 1);
 
 	$boxgraph .= '</td></tr>';
 	$boxgraph .= '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';

htdocs/adherents/admin/member_emails.php

Spacing +10 added lines, -10 removed lines

@@ -56,16 +56,16 @@
 // Editing global variables not related to a specific theme
 $constantes = array(
 	'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))),
-	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member','label'=>''),
-	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member','label'=>''),
-	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member','label'=>''),
-	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member','label'=>''),
-	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member','label'=>''),
-	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member','label'=>''),
-	'ADHERENT_MAIL_FROM'							=>array('type'=>'string','label'=>''),
-	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string','label'=>''),
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string','label'=>''),
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'')
+	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member', 'label'=>''),
+	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member', 'label'=>''),
+	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member', 'label'=>''),
+	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
+	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
+	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member', 'label'=>''),
+	'ADHERENT_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
+	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string', 'label'=>''),
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'')
 );
 
 

htdocs/partnership/class/partnership_type.class.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	public $active;
 
 
-	public $fields=array(
+	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
 		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

Spacing +5 added lines, -5 removed lines

@@ -802,7 +802,7 @@ 
 
 			if (!empty($object->refuse_note)) {
 				$object->actionmsg .= '<br>';
-				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
+				$object->actionmsg .= $langs->trans("Reason").': '.$object->refuse_note;
 			}
 
 			$object->sendtoid = 0;
@@ -823,7 +823,7 @@ 
 
 			if (!empty($object->cancel_note)) {
 				$object->actionmsg .= '<br>';
-				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note;
+				$object->actionmsg .= $langs->trans("Reason").': '.$object->cancel_note;
 			}
 
 			$object->sendtoid = 0;
@@ -844,7 +844,7 @@ 
 
 			if (!empty($object->context['comments'])) {
 				$object->actionmsg .= '<br>';
-				$object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments'];
+				$object->actionmsg .= $langs->trans("Comment").': '.$object->context['comments'];
 			}
 
 			$object->sendtoid = 0;
@@ -1472,8 +1472,8 @@ 
 		$actioncomm = new ActionComm($this->db);
 		$actioncomm->type_code   = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 		$actioncomm->code        = 'AC_'.$action;
-		$actioncomm->label       = $object->actionmsg2;		// Label of event
-		$actioncomm->note_private = $object->actionmsg;		// Description
+		$actioncomm->label       = $object->actionmsg2; // Label of event
+		$actioncomm->note_private = $object->actionmsg; // Description
 		$actioncomm->fk_project  = $projectid;
 		$actioncomm->datep       = $now;
 		$actioncomm->datef       = $now;

htdocs/core/lib/invoice.lib.php

Spacing +8 added lines, -8 removed lines

@@ -120,7 +120,7 @@ 
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -140,7 +140,7 @@ 
 			} else {
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
 			}
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
 		$head[$h][1] .= '/';
@@ -255,14 +255,14 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/facture/card-rec.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("RepeatableInvoice");
 	$head[$h][2] = 'card';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda-rec.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -282,7 +282,7 @@ 
 			} else {
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
 			}
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
 		$head[$h][1] .= '/';
@@ -318,7 +318,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/fourn/facture/card-rec.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card-rec.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("RepeatableSupplierInvoice");
 	$head[$h][2] = 'card';
 	$h++;
@@ -401,7 +401,7 @@ 
 									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)
 									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));
 				*/
-				$dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
+				$dataseries[$i] = array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
 				$i++;
 			}
 			if (!empty($dataseries[0])) {
@@ -448,7 +448,7 @@ 
 				$dolgraph->setShowPercent(1);
 				$dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars'));
 				//$dolgraph->SetType(array('pie'));
-				$dolgraph->setHeight('160');	/* 160 min is required to show the 6 lines of legend */
+				$dolgraph->setHeight('160'); /* 160 min is required to show the 6 lines of legend */
 				$dolgraph->setWidth('450');
 				$dolgraph->setHideXValues(true);
 				if ($mode == 'customers') {