Completed
Branch develop (f5af02)
by
unknown
17:35
created
htdocs/eventorganization/conferenceorbooth_contact.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	accessforbidden();
74 74
 }
75 75
 
76
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
76
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
77 77
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
78 78
 
79 79
 $permissiontoread = $user->rights->eventorganization->read;
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 if ($user->socid > 0) {
88 88
 	accessforbidden();
89 89
 }
90
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
90
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
91 91
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
92 92
 
93 93
 if (!$permissiontoread) {
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
112 112
 
113 113
 	if ($result >= 0) {
114
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':''));
114
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : ''));
115 115
 		exit;
116 116
 	} else {
117 117
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	$result = $object->delete_contact($lineid);
130 130
 
131 131
 	if ($result >= 0) {
132
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':''));
132
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : ''));
133 133
 		exit;
134 134
 	} else {
135 135
 		dol_print_error($db);
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 if (!empty($projectstatic->socid)) {
166 166
 	$projectstatic->fetch_thirdparty();
167 167
 }
168
-$withProjectUrl='';
168
+$withProjectUrl = '';
169 169
 $object->project = clone $projectstatic;
170 170
 
171 171
 if (!empty($withproject)) {
Please login to merge, or discard this patch.
htdocs/accountancy/admin/categories.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 	$arraykeyvalue = array();
126 126
 	foreach ($accountingcategory->lines_cptbk as $key => $val) {
127 127
 		$doc_ref = !empty($val->doc_ref) ? $val->doc_ref : '';
128
-		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' - ' . $val->label_compte . ($doc_ref ? ' '.$doc_ref : '');
128
+		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte).' - '.$val->label_compte.($doc_ref ? ' '.$doc_ref : '');
129 129
 	}
130 130
 
131 131
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
Please login to merge, or discard this patch.
htdocs/categories/traduction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
 $type = $object->type;
58 58
 if (is_numeric($type)) {
59
-	$type = Categorie::$MAP_ID_TO_CODE[$type];   // For backward compatibility
59
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
60 60
 }
61 61
 
62 62
 
Please login to merge, or discard this patch.
htdocs/societe/price.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
 // Get parameters
49 49
 $action 		= GETPOST('action', 'aZ09');
50
-$search_prod 	= GETPOST('search_prod', 'alpha');
50
+$search_prod = GETPOST('search_prod', 'alpha');
51 51
 $cancel 		= GETPOST('cancel', 'alpha');
52 52
 $search_label 	= GETPOST('search_label', 'alpha');
53 53
 $search_price 	= GETPOST('search_price');
Please login to merge, or discard this patch.
htdocs/societe/contact.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
68 68
 $cancel 	= GETPOST('cancel', 'alpha');
69 69
 $backtopage = GETPOST('backtopage', 'alpha');
70
-$confirm 	= GETPOST('confirm');
70
+$confirm = GETPOST('confirm');
71 71
 $socid 		= GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
72 72
 
73 73
 if ($user->socid) {
Please login to merge, or discard this patch.
htdocs/societe/consumption.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,10 +52,10 @@
 block discarded – undo
52 52
 }
53 53
 
54 54
 // Sort & Order fields
55
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
55
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
56 56
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
57 57
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
58
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
58
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
59 59
 $optioncss 	= GETPOST('optioncss', 'alpha');
60 60
 
61 61
 if (empty($page) || $page == -1) {
Please login to merge, or discard this patch.
htdocs/societe/document.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -39,21 +39,21 @@
 block discarded – undo
39 39
 
40 40
 
41 41
 // Get parameters
42
-$action 	= GETPOST('action', 'aZ09');
43
-$confirm 	= GETPOST('confirm');
44
-$id 		= (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
45
-$ref 		= GETPOST('ref', 'alpha');
42
+$action = GETPOST('action', 'aZ09');
43
+$confirm = GETPOST('confirm');
44
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
45
+$ref = GETPOST('ref', 'alpha');
46 46
 
47
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
47
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
48 48
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
49 49
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
50
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
50
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
51 51
 
52 52
 if (empty($page) || $page == -1) {
53 53
 	$page = 0;
54 54
 }     // If $page is not defined, or '' or -1
55 55
 
56
-$offset 	= $limit * $page;
56
+$offset = $limit * $page;
57 57
 $pageprev 	= $page - 1;
58 58
 $pagenext 	= $page + 1;
59 59
 
Please login to merge, or discard this patch.
htdocs/resource/agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
  */
96 96
 
97 97
 $parameters = array('id'=>$id);
98
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
98
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
99 99
 if ($reshook < 0) {
100 100
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
101 101
 }
Please login to merge, or discard this patch.
htdocs/compta/stats/cabyprodserv.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	$month_current = dol_print_date(dol_now(), '%m');
99 99
 	$year_start = $year;
100 100
 }
101
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
102
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
101
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
102
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
103 103
 // Quarter
104 104
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
105 105
 	$q = GETPOST("q", "int");
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 $headerparams = array_merge($commonparams, $headerparams);
209 209
 $tableparams = array_merge($commonparams, $tableparams);
210 210
 
211
-$paramslink="";
211
+$paramslink = "";
212 212
 foreach ($allparams as $key => $value) {
213 213
 	$paramslink .= '&'.$key.'='.$value;
214 214
 }
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
 	$modecompta = "RECETTES-DEPENSES";
232 232
 }
233 233
 
234
-$exportlink="";
235
-$namelink="";
234
+$exportlink = "";
235
+$namelink = "";
236 236
 
237 237
 // Show report header
238 238
 if ($modecompta == "CREANCES-DETTES") {
Please login to merge, or discard this patch.