Completed
Branch develop (ec25b8)
by
unknown
19:29
created
htdocs/core/boxes/box_graph_ticket_by_severity.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 		$badgeStatus7 = '#baa32b';
84 84
 		$badgeStatus8 = '#993013';
85 85
 		$badgeStatus9 = '#e7f0f0';
86
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
87
-			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
86
+		if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
87
+			include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
88 88
 		}
89 89
 		$this->max = $max;
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		$colorseriesstat = array();
102 102
 		if ($user->hasRight('ticket', 'read')) {
103 103
 			$sql = "SELECT cts.rowid, cts.label, cts.code";
104
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
104
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as cts";
105 105
 			$sql .= " WHERE cts.active = 1";
106 106
 			$sql .= $this->db->order('cts.rowid', 'ASC');
107 107
 			$resql = $this->db->query($sql);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 			$dataseries = array();
139 139
 			$data = array();
140 140
 			$sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb";
141
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
141
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
142 142
 			$sql .= " WHERE t.fk_statut <> 8";
143 143
 			$sql .= " GROUP BY t.severity_code";
144 144
 			$resql = $this->db->query($sql);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 				}
153 153
 				foreach ($listofoppcode as $rowid => $code) {
154 154
 					$dataseries[] = array(
155
-						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code),
155
+						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$code, 'c_ticket_severity', 'code', 'label', $code),
156 156
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
157 157
 					);
158 158
 				}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
191 191
 				}
192 192
 				$stringtoprint .= '</div>';
193
-				$this->info_box_contents[][]=array(
193
+				$this->info_box_contents[][] = array(
194 194
 					'td' => 'class="center"',
195 195
 					'text' => $stringtoprint
196 196
 				);
Please login to merge, or discard this patch.
htdocs/core/ajax/row.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	if ($reshook > 0) {
133 133
 		$perm = $hookmanager->resArray['perm'];
134 134
 	}
135
-	if (! $perm) {
135
+	if (!$perm) {
136 136
 		// We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
137 137
 		// If we are here, it is a hack attempt, so we report a warning.
138 138
 		print 'Bad permission to modify position of lines for object in table '.$table_element_line;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 	// Reorder line to have position of children lines sharing same counter than parent lines
156 156
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
157
-	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande','fk_contrat'))) {
157
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande', 'fk_contrat'))) {
158 158
 		$result = $row->line_order(true);
159 159
 	}
160 160
 } else {
Please login to merge, or discard this patch.
htdocs/core/actions_setmoduleoptions.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -78,19 +78,19 @@  discard block
 block discarded – undo
78 78
 
79 79
 	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
80 80
 	foreach ($listofdir as $key => $tmpdir) {
81
-		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
81
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
82 82
 		if (!$tmpdir) {
83 83
 			unset($listofdir[$key]);
84 84
 			continue;
85 85
 		}
86
-		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
86
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
87 87
 		if (!is_dir($tmpdir)) {
88 88
 			if (empty($nomessageinsetmoduleoptions)) {
89 89
 				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
90 90
 			}
91 91
 		} else {
92 92
 			$upload_dir = $tmpdir;
93
-			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
93
+			break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
94 94
 		}
95 95
 	}
96 96
 
@@ -130,19 +130,19 @@  discard block
 block discarded – undo
130 130
 
131 131
 		foreach ($listofdir as $key => $tmpdir) {
132 132
 			$tmpdir = trim($tmpdir);
133
-			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
133
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
134 134
 			if (!$tmpdir) {
135 135
 				unset($listofdir[$key]);
136 136
 				continue;
137 137
 			}
138
-			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
138
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
139 139
 			if (!is_dir($tmpdir)) {
140 140
 				if (empty($nomessageinsetmoduleoptions)) {
141 141
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
142 142
 				}
143 143
 			} else {
144 144
 				$upload_dir = $tmpdir;
145
-				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
145
+				break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
146 146
 			}
147 147
 		}
148 148
 
Please login to merge, or discard this patch.
htdocs/core/modules/workstation/mod_workstation_standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
  *  \ingroup    workstation
24 24
  *  \brief      File of class to manage Workstation numbering rules standard
25 25
  */
26
-require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
26
+require_once DOL_DOCUMENT_ROOT.'/core/modules/workstation/modules_workstation.php';
27 27
 
28 28
 /**
29 29
  * Class to manage the Standard numbering rule for Workstation
Please login to merge, or discard this patch.
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -135,8 +135,8 @@
 block discarded – undo
135 135
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
136 136
 					'firstname' => '', // For thirdparties, firstname is ''
137 137
 					'other' =>
138
-					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.	// date start real
139
-					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.			// date end planned
138
+					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.// date start real
139
+					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.// date end planned
140 140
 					('Contract='.$obj->fk_contrat).';'.
141 141
 					('ContactLine='.$obj->cdid),
142 142
 					'source_url' => $this->url($obj->id),
Please login to merge, or discard this patch.
htdocs/hrm/job_note.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
107 107
 
108 108
 	$morehtmlref = '<div class="refid">';
109
-	$morehtmlref.= $object->label;
109
+	$morehtmlref .= $object->label;
110 110
 	$morehtmlref .= '</div>';
111 111
 
112 112
 
Please login to merge, or discard this patch.
htdocs/hrm/skill_note.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
105 105
 
106 106
 	$morehtmlref = '<div class="refid">';
107
-	$morehtmlref.= $object->label;
107
+	$morehtmlref .= $object->label;
108 108
 	$morehtmlref .= '</div>';
109 109
 
110 110
 
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.