Completed
Branch develop (3211ba)
by
unknown
18:24
created
htdocs/core/class/html.formfile.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
154 154
 			$maxphptoshow = $maxfilesizearray['maxphptoshow'];
155 155
 			$maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];
156 156
 			if ($maxmin > 0) {
157
-				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
157
+				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
158 158
 			}
159 159
 			$out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"';
160 160
 			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
Please login to merge, or discard this patch.
htdocs/core/modules/export/modules_export.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 				if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg)) {
67 67
 					$moduleid = $reg[1];
68 68
 					if ($moduleid == 'csv') {
69
-						continue;	// This may happen if on old file export_csv.modules.php was not correctly deleted
69
+						continue; // This may happen if on old file export_csv.modules.php was not correctly deleted
70 70
 					}
71 71
 
72 72
 					// Loading Class
Please login to merge, or discard this patch.
htdocs/projet/list.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -144,20 +144,20 @@  discard block
 block discarded – undo
144 144
 $search_date_start_startmonth = GETPOST('search_date_start_startmonth', 'int');
145 145
 $search_date_start_startyear = GETPOST('search_date_start_startyear', 'int');
146 146
 $search_date_start_startday = GETPOST('search_date_start_startday', 'int');
147
-$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);	// Use tzserver
147
+$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver
148 148
 $search_date_start_endmonth = GETPOST('search_date_start_endmonth', 'int');
149 149
 $search_date_start_endyear = GETPOST('search_date_start_endyear', 'int');
150 150
 $search_date_start_endday = GETPOST('search_date_start_endday', 'int');
151
-$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);	// Use tzserver
151
+$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver
152 152
 
153 153
 $search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
154 154
 $search_date_end_startyear = GETPOST('search_date_end_startyear', 'int');
155 155
 $search_date_end_startday = GETPOST('search_date_end_startday', 'int');
156
-$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
156
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver
157 157
 $search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
158 158
 $search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
159 159
 $search_date_end_endday = GETPOST('search_date_end_endday', 'int');
160
-$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
160
+$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver
161 161
 
162 162
 if (isModEnabled('categorie')) {
163 163
 	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 $sqlfields = $sql; // $sql fields to remove for count total
454 454
 
455 455
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as p";
456
-if (!empty($extrafields->attributes[$object->table_element]['label']) &&is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
456
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
457 457
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
458 458
 }
459 459
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 			if ($searchCategoryProjectOperator == 0) {
624 624
 				$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")";
625 625
 			} else {
626
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject);
626
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProject);
627 627
 			}
628 628
 		}
629 629
 	}
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 	$param .= '&search_date_end_endday='.urlencode($search_date_end_endday);
820 820
 }
821 821
 if ($search_date_end_end) {
822
-	$param .= '&search_date_end_end=' . urlencode($search_date_end_end);
822
+	$param .= '&search_date_end_end='.urlencode($search_date_end_end);
823 823
 }
824 824
 if ($socid) {
825 825
 	$param .= '&socid='.urlencode($socid);
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
1023 1023
 	$categoriesArr[-2] = '- '.$langs->trans('NotCategorized').' -';
1024 1024
 	$moreforfilter .= Form::multiselectarray('search_category_customer_list', $categoriesArr, $searchCategoryCustomerList, 0, 0, 'minwidth300im minwidth300 widthcentpercentminusx', 0, 0, '', 'category', $tmptitle);
1025 1025
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_customer_operator" name="search_category_customer_operator" value="1"'.($searchCategoryCustomerOperator == 1 ? ' checked="checked"' : '').'/>';
1026
-	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_cus'); // Tooltip on click
1026
+	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories').' : '.$tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_cus'); // Tooltip on click
1027 1027
 	$moreforfilter .= '</div>';
1028 1028
 }
1029 1029
 
@@ -1536,7 +1536,7 @@  discard block
 block discarded – undo
1536 1536
 		// Project url
1537 1537
 		if (!empty($arrayfields['p.ref']['checked'])) {
1538 1538
 			print '<td class="nowraponall tdoverflowmax200" title="'.dol_escape_htmltag($object->ref).'">';
1539
-			print $object->getNomUrl(1, (!empty(GETPOST('search_usage_event_organization', 'int'))?'eventorganization':''));
1539
+			print $object->getNomUrl(1, (!empty(GETPOST('search_usage_event_organization', 'int')) ? 'eventorganization' : ''));
1540 1540
 			if ($object->hasDelay()) {
1541 1541
 				print img_warning($langs->trans('Late'));
1542 1542
 			}
Please login to merge, or discard this patch.
htdocs/projet/activity/perweek.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -763,7 +763,7 @@
 block discarded – undo
763 763
 			if (empty($totalforeachday[$tmpday])) {
764 764
 				$totalforeachday[$tmpday] = empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday];
765 765
 			} else {
766
-				$totalforeachday[$tmpday] +=  empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday];
766
+				$totalforeachday[$tmpday] += empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday];
767 767
 			}
768 768
 		}
769 769
 	}
Please login to merge, or discard this patch.