Completed
Branch develop (05527d)
by
unknown
15:23
created
htdocs/product/stock/stats/reception.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
 
40 40
 $id = GETPOST('id', 'int');
41 41
 $ref = GETPOST('ref', 'alpha');
42
-$batch  	= GETPOST('batch', 'alpha');
43
-$objectid  = GETPOST('productid', 'int');
42
+$batch = GETPOST('batch', 'alpha');
43
+$objectid = GETPOST('productid', 'int');
44 44
 
45 45
 // Security check
46 46
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
Please login to merge, or discard this patch.
htdocs/product/stock/stats/expedition.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
 
40 40
 $id = GETPOST('id', 'int');
41 41
 $ref = GETPOST('ref', 'alpha');
42
-$batch  	= GETPOST('batch', 'alpha');
43
-$objectid  = GETPOST('productid', 'int');
42
+$batch = GETPOST('batch', 'alpha');
43
+$objectid = GETPOST('productid', 'int');
44 44
 
45 45
 // Security check
46 46
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
Please login to merge, or discard this patch.
doctemplates/websites/website_template-noimg/containers/manifest.json.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__);
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
2
+$websitekey = basename(__DIR__);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
4 4
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
5 5
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
6 6
 ob_start();
Please login to merge, or discard this patch.
doctemplates/websites/website_template-noimg/containers/master.inc.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4
+	if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5 5
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
6 6
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3 3
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
4
+	if (! defined('USEEXTERNALSERVER')) {
5
+		define('USEEXTERNALSERVER', 1);
6
+	}
5 7
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
6 8
 }
Please login to merge, or discard this patch.
doctemplates/websites/website_template-noimg/containers/styles.css.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__);
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
2
+$websitekey = basename(__DIR__);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
4 4
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
5 5
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
6 6
 ob_start();
7
-if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
7
+if (!headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */
8 8
 	header('Cache-Control: max-age=3600, public, must-revalidate');
9 9
 	header('Content-type: text/css');
10 10
 }
Please login to merge, or discard this patch.
doctemplates/websites/website_template-restaurant/containers/master.inc.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3 3
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5
-    require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
4
+	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5
+	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 6
 }
7 7
 ?>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4
+    if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5 5
     require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 6
 }
7 7
 ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3 3
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
4
+    if (! defined('USEEXTERNALSERVER')) {
5
+    	define('USEEXTERNALSERVER', 1);
6
+    }
5 7
     require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 8
 }
7 9
 ?>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-restaurant/containers/styles.css.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__);
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
2
+$websitekey = basename(__DIR__);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
4 4
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
5 5
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
6 6
 ob_start();
7
-if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ 
7
+if (!headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ 
8 8
 header('Cache-Control: max-age=3600, public, must-revalidate');
9 9
 header('Content-type: text/css');
10 10
 }
Please login to merge, or discard this patch.
doctemplates/websites/website_template-stellar/containers/master.inc.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
4
+	if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5 5
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 6
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3 3
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
4
+	if (! defined('USEEXTERNALSERVER')) {
5
+		define('USEEXTERNALSERVER', 1);
6
+	}
5 7
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 8
 }
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.