Completed
Branch develop (c23a95)
by
unknown
18:46
created
htdocs/hrm/skill_agenda.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
34
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
35
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
34
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
35
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
37 37
 
38 38
 
39 39
 // Load translation files required by the page
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
153 153
 
154 154
 	$morehtmlref = '<div class="refid">';
155
-	$morehtmlref.= $object->label;
155
+	$morehtmlref .= $object->label;
156 156
 	$morehtmlref .= '</div>';
157 157
 
158 158
 
Please login to merge, or discard this patch.
htdocs/hrm/skill_document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
34 34
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
35 35
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
37
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
37
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
38 38
 
39 39
 // Load translation files required by the page
40 40
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132 132
 
133 133
 	$morehtmlref = '<div class="refid">';
134
-	$morehtmlref.= $object->label;
134
+	$morehtmlref .= $object->label;
135 135
 	$morehtmlref .= '</div>';
136 136
 
137 137
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
Please login to merge, or discard this patch.
htdocs/hrm/job_document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
33 33
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
34 34
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
35
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
35
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
37 37
 
38 38
 // Load translation files required by the page
39 39
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132 132
 
133 133
 	$morehtmlref = '<div class="refid">';
134
-	$morehtmlref.= $object->label;
134
+	$morehtmlref .= $object->label;
135 135
 	$morehtmlref .= '</div>';
136 136
 
137 137
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
Please login to merge, or discard this patch.
htdocs/hrm/lib/hrm.lib.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 	$h = 0;
46 46
 	$head = array();
47
-	$head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php";
47
+	$head[$h][0] = DOL_URL_ROOT."/admin/hrm.php";
48 48
 	$head[$h][1] = $langs->trans("Settings");
49 49
 	$head[$h][2] = 'settings';
50 50
 	$h++;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	$head[$h][2] = 'establishments';
55 55
 	$h++;
56 56
 
57
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
57
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/skill_extrafields.php';
58 58
 	$head[$h][1] = $langs->trans("SkillsExtraFields");
59 59
 	$nbExtrafields = $extrafields->attributes['hrm_skill']['count'];
60 60
 	if ($nbExtrafields > 0) {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	$head[$h][2] = 'skillsAttributes';
64 64
 	$h++;
65 65
 
66
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
66
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/job_extrafields.php';
67 67
 	$head[$h][1] = $langs->trans("JobsExtraFields");
68 68
 	$nbExtrafields = $extrafields->attributes['hrm_job']['count'];
69 69
 	if ($nbExtrafields > 0) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	$head[$h][2] = 'jobsAttributes';
73 73
 	$h++;
74 74
 
75
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
75
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/evaluation_extrafields.php';
76 76
 	$head[$h][1] = $langs->trans("EvaluationsExtraFields");
77 77
 	$nbExtrafields = $extrafields->attributes['hrm_evaluation']['count'];
78 78
 	if ($nbExtrafields > 0) {
Please login to merge, or discard this patch.
htdocs/hrm/class/evaluation.class.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
  */
27 27
 
28 28
 // Put here all includes required by your class file
29
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
30
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluationdet.class.php';
29
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
30
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluationdet.class.php';
31 31
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
32 32
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
33 33
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	/**
105 105
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
106 106
 	 */
107
-	public $fields=array(
107
+	public $fields = array(
108 108
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
109 109
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
110 110
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 		}
195 195
 
196 196
 		if (empty($user->rights->hrm->evaluation->readall)) {
197
-			$this->fields['fk_user']['type'].= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
197
+			$this->fields['fk_user']['type'] .= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
198 198
 		}
199 199
 
200 200
 		$this->date_eval = dol_now();
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 		$resultcreate = $this->createCommon($user, $notrigger);
231 231
 
232 232
 		if ($resultcreate > 0) {
233
-			require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
233
+			require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php';
234 234
 			$skillRank = new SkillRank($this->db);
235 235
 			$TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job." AND objecttype='job'"));
236 236
 
@@ -632,12 +632,12 @@  discard block
 block discarded – undo
632 632
 	public function getLastEvaluationForUser($fk_user)
633 633
 	{
634 634
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."hrm_evaluation ";
635
-		$sql.=	"WHERE fk_user=".((int) $fk_user)." ";
636
-		$sql.=	"ORDER BY date_eval DESC ";
637
-		$sql.=	"LIMIT 1 ";
635
+		$sql .= "WHERE fk_user=".((int) $fk_user)." ";
636
+		$sql .= "ORDER BY date_eval DESC ";
637
+		$sql .= "LIMIT 1 ";
638 638
 
639 639
 		$res = $this->db->query($sql);
640
-		if (!$res) { dol_print_error($this->db);}
640
+		if (!$res) { dol_print_error($this->db); }
641 641
 
642 642
 		$Tab = $this->db->fetch_object($res);
643 643
 
Please login to merge, or discard this patch.
htdocs/hrm/evaluation_list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
 // Default sort order (if not yet defined by previous GETPOST)
85 85
 if (!$sortfield) {
86
-	reset($object->fields);					// Reset is required to avoid key() to return null.
86
+	reset($object->fields); // Reset is required to avoid key() to return null.
87 87
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
88 88
 }
89 89
 if (!$sortorder) {
@@ -262,13 +262,13 @@  discard block
 block discarded – undo
262 262
 		}
263 263
 	} else {
264 264
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
265
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
265
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
266 266
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
267 267
 				if (preg_match('/_dtstart$/', $key)) {
268
-					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
268
+					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
269 269
 				}
270 270
 				if (preg_match('/_dtend$/', $key)) {
271
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
271
+					$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
272 272
 				}
273 273
 			}
274 274
 		}
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 }
280 280
 
281 281
 if (empty($permissiontoreadall)) {
282
-	$sql.= " AND t.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
282
+	$sql .= " AND t.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
283 283
 }
284 284
 
285 285
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
Please login to merge, or discard this patch.
htdocs/variants/ajax/orderAttribute.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Load Dolibarr environment
39 39
 require '../../main.inc.php';
40
-require DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
40
+require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
41 41
 
42 42
 // Security check
43 43
 if (!isModEnabled('variants')) {
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 if (GETPOST('roworder', 'alpha', 3)) {
62 62
 	$roworder = GETPOST('roworder', 'alpha', 3);
63 63
 
64
-	dol_syslog("AjaxOrderAttribute roworder=" . $roworder, LOG_DEBUG);
64
+	dol_syslog("AjaxOrderAttribute roworder=".$roworder, LOG_DEBUG);
65 65
 
66 66
 	$rowordertab = explode(',', $roworder);
67 67
 	$newrowordertab = array();
Please login to merge, or discard this patch.
htdocs/public/datapolicy/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 $idc = GETPOST('c', 'int');
41 41
 $ids = GETPOST('s', 'int');
42 42
 $ida = GETPOST('a', 'int');
43
-$action = GETPOST('action', 'aZ09');	// 1 or 2
43
+$action = GETPOST('action', 'aZ09'); // 1 or 2
44 44
 $l = GETPOST('l', 'alpha');
45 45
 $securitykey = GETPOST('key', 'alpha');
46 46
 
Please login to merge, or discard this patch.
htdocs/public/ticket/create_ticket.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -484,7 +484,7 @@
 block discarded – undo
484 484
 					setEventMessages($messagetoshow, null, 'warnings');
485 485
 					setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
486 486
 
487
-					header("Location: index.php".(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
487
+					header("Location: index.php".(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : ''));
488 488
 					exit;
489 489
 				}
490 490
 			} else {
Please login to merge, or discard this patch.