Completed
Branch develop (21bcc8)
by
unknown
19:13
created
htdocs/hrm/job_card.php 1 patch
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -139,8 +139,12 @@  discard block
 block discarded – undo
139 139
 //if ($user->socid > 0) $socid = $user->socid;
140 140
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
141 141
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
142
-if (empty($conf->hrm->enabled)) accessforbidden();
143
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
142
+if (empty($conf->hrm->enabled)) {
143
+	accessforbidden();
144
+}
145
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
146
+	accessforbidden();
147
+}
144 148
 
145 149
 
146 150
 /*
@@ -435,9 +439,12 @@  discard block
 block discarded – undo
435 439
 
436 440
 				$parameters = array();
437 441
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
438
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
439
-				if (empty($reshook))
440
-					$object->formAddObjectLine(1, $mysoc, $soc);
442
+				if ($reshook < 0) {
443
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
444
+				}
445
+				if (empty($reshook)) {
446
+									$object->formAddObjectLine(1, $mysoc, $soc);
447
+				}
441 448
 			}
442 449
 		}
443 450
 
Please login to merge, or discard this patch.
htdocs/hrm/position_card.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,8 +113,12 @@
 block discarded – undo
113 113
 //if ($user->socid > 0) $socid = $user->socid;
114 114
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
115 115
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
116
-if (empty($conf->hrm->enabled)) accessforbidden();
117
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
116
+if (empty($conf->hrm->enabled)) {
117
+	accessforbidden();
118
+}
119
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
120
+	accessforbidden();
121
+}
118 122
 
119 123
 $langs->loadLangs(array("hrm", "other"));
120 124
 
Please login to merge, or discard this patch.
htdocs/core/class/commonobject.class.php 1 patch
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3647,7 +3647,9 @@  discard block
 block discarded – undo
3647 3647
 		// Hook for explicitly set the targettype if it must be differtent than $this->element
3648 3648
 		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
3649 3649
 		if ($reshook > 0) {
3650
-			if (!empty($hookmanager->resArray['targettype'])) $targettype = $hookmanager->resArray['targettype'];
3650
+			if (!empty($hookmanager->resArray['targettype'])) {
3651
+				$targettype = $hookmanager->resArray['targettype'];
3652
+			}
3651 3653
 		}
3652 3654
 
3653 3655
 		$this->db->begin();
@@ -3729,10 +3731,18 @@  discard block
 block discarded – undo
3729 3731
 		// Hook for explicitly set the targettype if it must be differtent than $this->element
3730 3732
 		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
3731 3733
 		if ($reshook > 0) {
3732
-			if (!empty($hookmanager->resArray['sourcetype'])) $sourcetype = $hookmanager->resArray['sourcetype'];
3733
-			if (!empty($hookmanager->resArray['sourceid'])) $sourceid = $hookmanager->resArray['sourceid'];
3734
-			if (!empty($hookmanager->resArray['targettype'])) $targettype = $hookmanager->resArray['targettype'];
3735
-			if (!empty($hookmanager->resArray['targetid'])) $targetid = $hookmanager->resArray['targetid'];
3734
+			if (!empty($hookmanager->resArray['sourcetype'])) {
3735
+				$sourcetype = $hookmanager->resArray['sourcetype'];
3736
+			}
3737
+			if (!empty($hookmanager->resArray['sourceid'])) {
3738
+				$sourceid = $hookmanager->resArray['sourceid'];
3739
+			}
3740
+			if (!empty($hookmanager->resArray['targettype'])) {
3741
+				$targettype = $hookmanager->resArray['targettype'];
3742
+			}
3743
+			if (!empty($hookmanager->resArray['targetid'])) {
3744
+				$targetid = $hookmanager->resArray['targetid'];
3745
+			}
3736 3746
 		}
3737 3747
 
3738 3748
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {
@@ -6600,7 +6610,9 @@  discard block
 block discarded – undo
6600 6610
 			$showtime = 1;
6601 6611
 
6602 6612
 			// Do not show current date when field not required (see selectDate() method)
6603
-			if (!$required && $value == '') $value = '-1';
6613
+			if (!$required && $value == '') {
6614
+				$value = '-1';
6615
+			}
6604 6616
 
6605 6617
 			// TODO Must also support $moreparam
6606 6618
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1, '', '', '', 1, '', '', 'tzuserrel');
Please login to merge, or discard this patch.
htdocs/hrm/skill_agenda.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
htdocs/hrm/evaluation_document.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
htdocs/hrm/skill_list.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -188,13 +188,19 @@
 block discarded – undo
188 188
 }
189 189
 
190 190
 // Security check (enable the most restrictive one)
191
-if ($user->socid > 0) accessforbidden();
191
+if ($user->socid > 0) {
192
+	accessforbidden();
193
+}
192 194
 //if ($user->socid > 0) accessforbidden();
193 195
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
194 196
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
195 197
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
196
-if (empty($conf->hrm->enabled)) accessforbidden();
197
-if (!$permissiontoread) accessforbidden();
198
+if (empty($conf->hrm->enabled)) {
199
+	accessforbidden();
200
+}
201
+if (!$permissiontoread) {
202
+	accessforbidden();
203
+}
198 204
 
199 205
 
200 206
 
Please login to merge, or discard this patch.
htdocs/hrm/skill_document.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
htdocs/hrm/job_agenda.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
htdocs/hrm/job_document.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.