View GitHub Repository dolibarr

Schedule Inspection
Subscribe
Completed
Branch — develop (0ceacf)
by
unknown
18:51
created
Category
Toggle Patches
htdocs/website/class/websitepage.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
 	 */
57 57 
 	public $fk_website;
58 58
59 
-	public $fk_page;		// If translation of another page
59 
+	public $fk_page; // If translation of another page
60 60
61 61 
 	public $pageurl;
62 62 
 	public $aliasalt;
 
@@ -118,8 +118,8 @@  discard block
 
 block discarded – undo
118 118 
 	 */
119 119 
 	public $fk_object;
120 120
121 
-	const STATUS_DRAFT = 0;			// offline
122 
-	const STATUS_VALIDATED = 1;		// online
121 
+	const STATUS_DRAFT = 0; // offline
122 
+	const STATUS_VALIDATED = 1; // online
123 123
124 124
125 125 
 	/**
Please login to merge, or discard this patch.
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -179,7 +179,7 @@  discard block
 
 block discarded – undo
179 179 
 		$maxfilesizearray = getMaxFileSizeArray();
180 180 
 		$maxmin = $maxfilesizearray['maxmin'];
181 181 
 		if ($maxmin > 0) {
182 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
182 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
183 183 
 		}
184 184 
 		$texte .= ' <input type="file" name="uploadfile">';
185 185 
 		$texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -273,7 +273,7 @@  discard block
 
 block discarded – undo
273 273 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
274 274 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
275 275 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
276 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
276 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
277 277 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
278 278 
 				// Get extension (ods or odt)
279 279 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -282,11 +282,11 @@  discard block
 
 block discarded – undo
282 282 
 					if ($format == '1') {
283 283 
 						$format = '%Y%m%d%H%M%S';
284 284 
 					}
285 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
285 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
286 286 
 				} else {
287 
-					$filename = $newfiletmp . '.' . $newfileformat;
287 
+					$filename = $newfiletmp.'.'.$newfileformat;
288 288 
 				}
289 
-				$file = $dir . '/' . $filename;
289 
+				$file = $dir.'/'.$filename;
290 290 
 				//print "newdir=".$dir;
291 291 
 				//print "newfile=".$newfile;
292 292 
 				//print "file=".$file;
 
@@ -295,7 +295,7 @@  discard block
 
 block discarded – undo
295 295 
 				dol_mkdir($conf->reception->dir_temp);
296 296 
 				if (!is_writable($conf->reception->dir_temp)) {
297 297 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp);
298 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
298 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
299 299 
 					return -1;
300 300 
 				}
301 301
Please login to merge, or discard this patch.
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -186,7 +186,7 @@  discard block
 
 block discarded – undo
186 186 
 		$maxfilesizearray = getMaxFileSizeArray();
187 187 
 		$maxmin = $maxfilesizearray['maxmin'];
188 188 
 		if ($maxmin > 0) {
189 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
189 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
190 190 
 		}
191 191 
 		$texte .= ' <input type="file" name="uploadfile">';
192 192 
 		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -280,7 +280,7 @@  discard block
 
 block discarded – undo
280 280 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
281 281 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
282 282 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
283 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
283 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
284 284 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
285 285 
 				// Get extension (ods or odt)
286 286 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -289,11 +289,11 @@  discard block
 
 block discarded – undo
289 289 
 					if ($format == '1') {
290 290 
 						$format = '%Y%m%d%H%M%S';
291 291 
 					}
292 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
292 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
293 293 
 				} else {
294 
-					$filename = $newfiletmp . '.' . $newfileformat;
294 
+					$filename = $newfiletmp.'.'.$newfileformat;
295 295 
 				}
296 
-				$file = $dir . '/' . $filename;
296 
+				$file = $dir.'/'.$filename;
297 297 
 				//print "newdir=".$dir;
298 298 
 				//print "newfile=".$newfile;
299 299 
 				//print "file=".$file;
 
@@ -302,7 +302,7 @@  discard block
 
 block discarded – undo
302 302 
 				dol_mkdir($conf->expedition->dir_temp);
303 303 
 				if (!is_writable($conf->expedition->dir_temp)) {
304 304 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->expedition->dir_temp);
305 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
305 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
306 306 
 					return -1;
307 307 
 				}
308 308
Please login to merge, or discard this patch.
htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -180,7 +180,7 @@  discard block
 
 block discarded – undo
180 180 
 		$maxfilesizearray = getMaxFileSizeArray();
181 181 
 		$maxmin = $maxfilesizearray['maxmin'];
182 182 
 		if ($maxmin > 0) {
183 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
183 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
184 184 
 		}
185 185 
 		$texte .= ' <input type="file" name="uploadfile">';
186 186 
 		$texte .= '<input type="hidden" value="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -276,7 +276,7 @@  discard block
 
 block discarded – undo
276 276 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
277 277 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
278 278 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
279 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
279 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
280 280 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
281 281 
 				// Get extension (ods or odt)
282 282 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -285,11 +285,11 @@  discard block
 
 block discarded – undo
285 285 
 					if ($format == '1') {
286 286 
 						$format = '%Y%m%d%H%M%S';
287 287 
 					}
288 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
288 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
289 289 
 				} else {
290 
-					$filename = $newfiletmp . '.' . $newfileformat;
290 
+					$filename = $newfiletmp.'.'.$newfileformat;
291 291 
 				}
292 
-				$file = $dir . '/' . $filename;
292 
+				$file = $dir.'/'.$filename;
293 293 
 				//print "newdir=".$dir;
294 294 
 				//print "newfile=".$newfile;
295 295 
 				//print "file=".$file;
 
@@ -298,7 +298,7 @@  discard block
 
 block discarded – undo
298 298 
 				dol_mkdir($conf->bom->dir_temp);
299 299 
 				if (!is_writable($conf->bom->dir_temp)) {
300 300 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->bom->dir_temp);
301 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
301 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
302 302 
 					return -1;
303 303 
 				}
304 304
Please login to merge, or discard this patch.
htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -269,7 +269,7 @@  discard block
 
 block discarded – undo
269 269 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
270 270 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
271 271 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
272 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
272 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
273 273 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
274 274 
 				// Get extension (ods or odt)
275 275 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -278,11 +278,11 @@  discard block
 
 block discarded – undo
278 278 
 					if ($format == '1') {
279 279 
 						$format = '%Y%m%d%H%M%S';
280 280 
 					}
281 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
281 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
282 282 
 				} else {
283 
-					$filename = $newfiletmp . '.' . $newfileformat;
283 
+					$filename = $newfiletmp.'.'.$newfileformat;
284 284 
 				}
285 
-				$file = $dir . '/' . $filename;
285 
+				$file = $dir.'/'.$filename;
286 286 
 				//print "newdir=".$dir;
287 287 
 				//print "newfile=".$newfile;
288 288 
 				//print "file=".$file;
 
@@ -291,7 +291,7 @@  discard block
 
 block discarded – undo
291 291 
 				dol_mkdir($conf->mrp->dir_temp);
292 292 
 				if (!is_writable($conf->mrp->dir_temp)) {
293 293 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mrp->dir_temp);
294 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
294 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
295 295 
 					return -1;
296 296 
 				}
297 297
Please login to merge, or discard this patch.
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 		$maxfilesizearray = getMaxFileSizeArray();
188 188 
 		$maxmin = $maxfilesizearray['maxmin'];
189 189 
 		if ($maxmin > 0) {
190 
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
190 
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
191 191 
 		}
192 192 
 		$texte .= ' <input type="file" name="uploadfile">';
193 193 
 		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 
@@ -282,7 +282,7 @@  discard block
 
 block discarded – undo
282 282 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
283 283 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
284 284 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
285 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
285 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
286 286
287 287 
 				// Get extension (ods or odt)
288 288 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -291,11 +291,11 @@  discard block
 
 block discarded – undo
291 291 
 					if ($format == '1') {
292 292 
 						$format = '%Y%m%d%H%M%S';
293 293 
 					}
294 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
294 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
295 295 
 				} else {
296 
-					$filename = $newfiletmp . '.' . $newfileformat;
296 
+					$filename = $newfiletmp.'.'.$newfileformat;
297 297 
 				}
298 
-				$file = $dir . '/' . $filename;
298 
+				$file = $dir.'/'.$filename;
299 299 
 				//print "newdir=".$dir;
300 300 
 				//print "newfile=".$newfile;
301 301 
 				//print "file=".$file;
 
@@ -304,7 +304,7 @@  discard block
 
 block discarded – undo
304 304 
 				dol_mkdir($conf->commande->dir_temp);
305 305 
 				if (!is_writable($conf->commande->dir_temp)) {
306 306 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->commande->dir_temp);
307 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
307 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
308 308 
 					return -1;
309 309 
 				}
310 310
Please login to merge, or discard this patch.
core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -264,7 +264,7 @@  discard block
 
 block discarded – undo
264 264 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
265 265 
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
266 266 
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
267 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
267 
+				$newfiletmp = $objectref.'_'.$newfiletmp;
268 268 
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
269 269 
 				// Get extension (ods or odt)
270 270 
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 
@@ -273,11 +273,11 @@  discard block
 
 block discarded – undo
273 273 
 					if ($format == '1') {
274 274 
 						$format = '%Y%m%d%H%M%S';
275 275 
 					}
276 
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
276 
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
277 277 
 				} else {
278 
-					$filename = $newfiletmp . '.' . $newfileformat;
278 
+					$filename = $newfiletmp.'.'.$newfileformat;
279 279 
 				}
280 
-				$file = $dir . '/' . $filename;
280 
+				$file = $dir.'/'.$filename;
281 281 
 				//print "newdir=".$dir;
282 282 
 				//print "newfile=".$newfile;
283 283 
 				//print "file=".$file;
 
@@ -286,7 +286,7 @@  discard block
 
 block discarded – undo
286 286 
 				dol_mkdir($conf->fournisseur->commande->dir_temp);
287 287 
 				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
288 288 
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->dir_temp);
289 
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
289 
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
290 290 
 					return -1;
291 291 
 				}
292 292
Please login to merge, or discard this patch.
htdocs/variants/class/ProductCombination2ValuePair.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -69,8 +69,8 @@  discard block
 
 block discarded – undo
69 69 
 	 */
70 70 
 	public function __toString()
71 71 
 	{
72 
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
73 
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
72 
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
73 
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
74 74
75 75 
 		$prodattr = new ProductAttribute($this->db);
76 76 
 		$prodattrval = new ProductAttributeValue($this->db);
 
@@ -78,7 +78,7 @@  discard block
 
 block discarded – undo
78 78 
 		$prodattr->fetch($this->fk_prod_attr);
79 79 
 		$prodattrval->fetch($this->fk_prod_attr_val);
80 80
81 
-		return $prodattr->label . ': ' . $prodattrval->value;
81 
+		return $prodattr->label.': '.$prodattrval->value;
82 82 
 	}
83 83
84 84 
 	/**
 
@@ -89,14 +89,14 @@  discard block
 
 block discarded – undo
89 89 
 	 */
90 90 
 	public function create($user)
91 91 
 	{
92 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
92 
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
93 93 
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
94 
-		VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")";
94 
+		VALUES(" . (int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
95 95
96 96 
 		$query = $this->db->query($sql);
97 97
98 98 
 		if ($query) {
99 
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val');
99 
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
100 100
101 101 
 			return 1;
102 102 
 		}
 
@@ -117,7 +117,7 @@  discard block
 
 block discarded – undo
117 117 
         c2v.fk_prod_attr_val,
118 118 
         c2v.fk_prod_attr,
119 119 
         c2v.fk_prod_combination
120 
-        FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
120 
+        FROM " . MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
121 121 
         WHERE c2v.fk_prod_combination = " . (int) $fk_combination;
122 122
123 123 
 		$sql .= $this->db->order('c.position', 'asc');
 
@@ -151,7 +151,7 @@  discard block
 
 block discarded – undo
151 151 
 	 */
152 152 
 	public function deleteByFkCombination($fk_combination)
153 153 
 	{
154 
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination;
154 
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
155 155
156 156 
 		if ($this->db->query($sql)) {
157 157 
 			return 1;
Please login to merge, or discard this patch.
htdocs/hrm/position_note.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -28,9 +28,9 @@
 
 block discarded – undo
28 28
29 29 
 // Load Dolibarr environment
30 30 
 require '../main.inc.php';
31 
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
32 
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
33 
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
31 
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
32 
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
33 
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
34 34
35 35 
 // Load translation files required by the page
36 36 
 $langs->loadLangs(array('hrm', 'companies'));
Please login to merge, or discard this patch.