View GitHub Repository dolibarr

Schedule Inspection
Subscribe
Completed
Branch — develop (8b51aa)
by
unknown
16:02
created
Status
Category
Toggle Patches
doctemplates/websites/website_template-homesubmenu/containers/index.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,9 @@
 
 block discarded – undo
1 1 
 <?php
2 2 
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
3 3 
 global $dolibarr_main_data_root;
4 
-if (empty($dolibarr_main_data_root)) require './page202.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page202.tpl.php';
4 
+if (empty($dolibarr_main_data_root)) {
5 
+	require './page202.tpl.php';
6 
+} else {
7 
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page202.tpl.php';
8 
+}
5 9 
 ?>
Please login to merge, or discard this patch.
websites/website_template-onepageblackpurple/containers/page148.tpl.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -1,6 +1,6 @@  discard block
 
 block discarded – undo
1 1 
 <?php // BEGIN PHP
2 
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
3 
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
2 
+$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__;
3 
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4 4 
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 5 
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
6 6 
 } // Not already loaded
 
@@ -272,7 +272,7 @@  discard block
 
 block discarded – undo
272 272 
 			  <!-- Section: Social media -->
273 273 
 			  <section class="mb-4">
274 274 
 				<?php foreach ($mysoc->socialnetworks as $key => $value) {
275 
-					print '<a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a>';
275 
+					print '<a class="btn btn-perso2 btn-floating m-1" href="'.(preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a>';
276 276 
 				} ?>
277 277
278 278 
 			  </section>
Please login to merge, or discard this patch.
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php // BEGIN PHP
2 
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2 
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3 
+	$websitepagefile=__FILE__;
4 
+}
3 5 
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6 
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7 
 	require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php';
 
@@ -26,7 +28,10 @@  discard block
 
 block discarded – undo
26 28 
 <!-- Include link to JS file -->
27 29 
 <script async src="/javascript.js.php"></script>
28 30 
 <!-- Include HTML header from common file -->
29 
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31 
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32 
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33 
+}
34 
+?>
30 35 
 <!-- Include HTML header from page header block -->
31 36 
 <head>
32 37 
 		<meta charset="UTF-8" />
Please login to merge, or discard this patch.
websites/website_template-onepageblackpurple/containers/index.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,4 +1,8 @@
 
 block discarded – undo
1 1 
 <?php
2 2 
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
3 3 
 global $dolibarr_main_data_root;
4 
-if (empty($dolibarr_main_data_root)) require './page148.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page148.tpl.php';
4 
+if (empty($dolibarr_main_data_root)) {
5 
+	require './page148.tpl.php';
6 
+} else {
7 
+	require $dolibarr_main_data_root.'/website/'.$website->ref.'/page148.tpl.php';
8 
+}
Please login to merge, or discard this patch.
htdocs/install/upgrade2.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -4237,7 +4237,7 @@  discard block
 
 block discarded – undo
4237 4237
4238 4238 
 	if (!is_object($user)) {
4239 4239 
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
4240 
-		$user = new User($db);	// To avoid error during migration
4240 
+		$user = new User($db); // To avoid error during migration
4241 4241 
 	}
4242 4242
4243 4243 
 	dolibarr_install_syslog("upgrade2::migrate_reload_modules force=".$force.", listofmodule=".join(',', array_keys($listofmodule)));
 
@@ -5043,17 +5043,17 @@  discard block
 
 block discarded – undo
5043 5043 
 	print '<b>'.$langs->trans('MigrationContractLineRank')."</b><br>\n";
5044 5044
5045 5045 
 	$sql = "SELECT c.rowid as cid ,cd.rowid as cdid,cd.rang FROM ".$db->prefix()."contratdet as cd INNER JOIN ".$db->prefix()."contrat as c ON c.rowid=cd.fk_contrat AND cd.rang=0";
5046 
-	$sql .=" ORDER BY c.rowid,cd.rowid";
5046 
+	$sql .= " ORDER BY c.rowid,cd.rowid";
5047 5047
5048 5048 
 	$resql = $db->query($sql);
5049 5049 
 	if ($resql) {
5050 
-		$currentRank=0;
5051 
-		$current_contract=0;
5050 
+		$currentRank = 0;
5051 
+		$current_contract = 0;
5052 5052 
 		while ($obj = $db->fetch_object($resql)) {
5053 
-			if (empty($current_contract) || $current_contract==$obj->cid) {
5053 
+			if (empty($current_contract) || $current_contract == $obj->cid) {
5054 5054 
 				$currentRank++;
5055 5055 
 			} else {
5056 
-				$currentRank=1;
5056 
+				$currentRank = 1;
5057 5057 
 			}
5058 5058
5059 5059 
 			$sqlUpd = "UPDATE ".$db->prefix()."contratdet SET rang=".(int) $currentRank." WHERE rowid=".(int) $obj->cdid;
 
@@ -5065,7 +5065,7 @@  discard block
 
 block discarded – undo
5065 5065 
 				$error++;
5066 5066 
 			}
5067 5067
5068 
-			$current_contract =  $obj->cid;
5068 
+			$current_contract = $obj->cid;
5069 5069 
 		}
5070 5070 
 	} else {
5071 5071 
 		$error++;
Please login to merge, or discard this patch.
htdocs/workstation/workstation_note.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -43,19 +43,19 @@  discard block
 
 block discarded – undo
43 43 
 $object = new Workstation($db);
44 44 
 $extrafields = new ExtraFields($db);
45 45 
 $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
46 
-$hookmanager->initHooks(array('workstationnote', 'globalcard'));       // Note that conf->hooks_modules contains array
46 
+$hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note that conf->hooks_modules contains array
47 47
48 48 
 // Fetch optionals attributes and labels
49 49 
 $extrafields->fetch_name_optionals_label($object->table_element);
50 50
51 51 
 // Load object
52 
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';     // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
52 
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
53 53 
 if ($id > 0 || !empty($ref)) {
54 54 
 	$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
55 55 
 }
56 56
57 
-$permissionnote = $user->rights->workstation->workstation->write;      // Used by the include of actions_setnotes.inc.php
58 
-$permissiontoadd = $user->rights->workstation->workstation->write;     // Used by the include of actions_addupdatedelete.inc.php
57 
+$permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
58 
+$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
59 59
60 60 
 // Security check
61 61 
 $isdraft = 0;
 
@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
  * Actions
67 67 
  */
68 68 
 $parameters = array();
69 
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);     // Note that $action and $object may have been modified by some hooks
69 
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
70 70 
 if ($reshook < 0) {
71 71 
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
72 72 
 }
Please login to merge, or discard this patch.
htdocs/adherents/index.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -93,10 +93,10 @@  discard block
 
 block discarded – undo
93 93 
 	$year = date('Y');
94 94 
 	$numberyears = getDolGlobalInt("MAIN_NB_OF_YEAR_IN_MEMBERSHIP_WIDGET_GRAPH");
95 95
96 
-	$boxgraph .='<div class="div-table-responsive-no-min">';
97 
-	$boxgraph .='<table class="noborder nohover centpercent">';
98 
-	$boxgraph .='<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year-$numberyears).' - '.$year.')' : '').'</th></tr>';
99 
-	$boxgraph .='<tr><td class="center" colspan="2">';
96 
+	$boxgraph .= '<div class="div-table-responsive-no-min">';
97 
+	$boxgraph .= '<table class="noborder nohover centpercent">';
98 
+	$boxgraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'</th></tr>';
99 
+	$boxgraph .= '<tr><td class="center" colspan="2">';
100 100
101 101 
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
102 102 
 	$stats = new AdherentStats($db, 0, $userid);
 
@@ -115,7 +115,7 @@  discard block
 
 block discarded – undo
115 115 
 	}
116 116
117 117 
 	$dataseries = array();
118 
-	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']);			// Draft, not yet validated
118 
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']); // Draft, not yet validated
119 119 
 	$dataseries[] = array($langs->transnoentitiesnoconv("WaitingSubscription"), $sumMembers['total']['members_pending']);
120 120 
 	$dataseries[] = array($langs->transnoentitiesnoconv("UpToDate"), $sumMembers['total']['members_uptodate']);
121 121 
 	$dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), $sumMembers['total']['members_expired']);
 
@@ -133,7 +133,7 @@  discard block
 
 block discarded – undo
133 133 
 	$dolgraph->SetType(array('pie'));
134 134 
 	$dolgraph->setHeight('200');
135 135 
 	$dolgraph->draw('idgraphstatus');
136 
-	$boxgraph .=$dolgraph->show($total ? 0 : 1);
136 
+	$boxgraph .= $dolgraph->show($total ? 0 : 1);
137 137
138 138 
 	$boxgraph .= '</td></tr>';
139 139 
 	$boxgraph .= '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
Please login to merge, or discard this patch.
htdocs/adherents/admin/member_emails.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -56,16 +56,16 @@
 
 block discarded – undo
56 56 
 // Editing global variables not related to a specific theme
57 57 
 $constantes = array(
58 58 
 	'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))),
59 
-	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member','label'=>''),
60 
-	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member','label'=>''),
61 
-	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member','label'=>''),
62 
-	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member','label'=>''),
63 
-	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member','label'=>''),
64 
-	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member','label'=>''),
65 
-	'ADHERENT_MAIL_FROM'							=>array('type'=>'string','label'=>''),
66 
-	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string','label'=>''),
67 
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string','label'=>''),
68 
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'')
59 
+	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member', 'label'=>''),
60 
+	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member', 'label'=>''),
61 
+	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member', 'label'=>''),
62 
+	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
63 
+	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
64 
+	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member', 'label'=>''),
65 
+	'ADHERENT_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
66 
+	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
67 
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string', 'label'=>''),
68 
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'')
69 69 
 );
70 70
71 71
Please login to merge, or discard this patch.
htdocs/partnership/class/partnership_type.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -68,7 +68,7 @@
 
 block discarded – undo
68 68 
 	public $active;
69 69
70 70
71 
-	public $fields=array(
71 
+	public $fields = array(
72 72 
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
73 73 
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
74 74 
 		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
Please login to merge, or discard this patch.
htdocs/partnership/partnership_card.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -42,7 +42,7 @@  discard block
 
 block discarded – undo
42 42 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
43 43 
 $backtopage = GETPOST('backtopage', 'alpha');
44 44 
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
45 
-$lineid   = GETPOST('lineid', 'int');
45 
+$lineid = GETPOST('lineid', 'int');
46 46 
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
47 47
48 48 
 // Initialize technical objects
 
@@ -74,10 +74,10 @@  discard block
 
 block discarded – undo
74 74 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
75 75
76 76
77 
-$permissiontoread 		= $user->hasRight('partnership', 'read');
78 
-$permissiontoadd 		= $user->hasRight('partnership', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
77 
+$permissiontoread = $user->hasRight('partnership', 'read');
78 
+$permissiontoadd = $user->hasRight('partnership', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
79 79 
 $permissiontodelete 	= $user->hasRight('partnership', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
80 
-$permissionnote 		= $user->hasRight('partnership', 'write'); // Used by the include of actions_setnotes.inc.php
80 
+$permissionnote = $user->hasRight('partnership', 'write'); // Used by the include of actions_setnotes.inc.php
81 81 
 $permissiondellink 		= $user->hasRight('partnership', 'write'); // Used by the include of actions_dellink.inc.php
82 82 
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
83 83 
 $managedfor 			= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
@@ -122,8 +122,8 @@  discard block
 
 block discarded – undo
122 122 
 		}
123 123 
 	}
124 124
125 
-	$fk_partner 	= ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
126 
-	$obj_partner 	= ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
125 
+	$fk_partner = ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
126 
+	$obj_partner = ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
127 127
128 128 
 	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
129 129
Please login to merge, or discard this patch.