Completed
Branch develop (5afae4)
by
unknown
18:19
created
htdocs/core/boxes/box_members_subscriptions_by_year.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *	\brief      Module to show box of members
25 25
  */
26 26
 
27
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
27
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
28 28
 
29 29
 
30 30
 /**
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 
84 84
 		$this->max = $max;
85 85
 
86
-		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
87
-		require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php';
86
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
87
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
88 88
 		$memberstatic = new Adherent($this->db);
89 89
 		$statictype = new AdherentType($this->db);
90 90
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 			$numb = 0;
101 101
 
102 102
 			$sql = "SELECT c.subscription, c.dateadh as dateh";
103
-			$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "subscription as c";
104
-			$sql .= " WHERE d.entity IN (" . getEntity('adherent') . ")";
103
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
104
+			$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
105 105
 			$sql .= " AND d.rowid = c.fk_adherent";
106 106
 
107 107
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 				$this->info_box_contents[0][0] = array(
217 217
 					'td' => '',
218 218
 					'maxlength' => 500,
219
-					'text' => ($this->db->error() . ' sql=' . $sql),
219
+					'text' => ($this->db->error().' sql='.$sql),
220 220
 				);
221 221
 			}
222 222
 		} else {
Please login to merge, or discard this patch.
htdocs/core/modules/modSociete.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@
 block discarded – undo
201 201
 		$this->rights[$r][0] = 130;
202 202
 		$this->rights[$r][1] = 'Modify thirdparty information payment';
203 203
 		$this->rights[$r][3] = 0;
204
-		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
204
+		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
205 205
 		$this->rights[$r][5] = 'write';
206 206
 
207 207
 		// 262 : Restrict access to sales representative
Please login to merge, or discard this patch.
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 		$maxfilesizearray = getMaxFileSizeArray();
435 435
 		$maxmin = $maxfilesizearray['maxmin'];
436 436
 		if ($maxmin > 0) {
437
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
437
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
438 438
 		}
439 439
 		$texte .= ' <input type="file" name="uploadfile">';
440 440
 		$texte .= '<input type="hidden" value="PROJECT_TASK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -514,9 +514,9 @@  discard block
 block discarded – undo
514 514
 				$newfiletmp = preg_replace('/\.(ods|odt)/i', '', $newfile);
515 515
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
516 516
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
517
-				$newfiletmp = $objectref . '_' . $newfiletmp;
517
+				$newfiletmp = $objectref.'_'.$newfiletmp;
518 518
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
519
-				$file = $dir . '/' . $newfiletmp . '.odt';
519
+				$file = $dir.'/'.$newfiletmp.'.odt';
520 520
 				//print "newdir=".$dir;
521 521
 				//print "newfile=".$newfile;
522 522
 				//print "file=".$file;
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 				dol_mkdir($conf->project->dir_temp);
526 526
 				if (!is_writable($conf->project->dir_temp)) {
527 527
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->project->dir_temp);
528
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
528
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
529 529
 					return -1;
530 530
 				}
531 531
 
Please login to merge, or discard this patch.
htdocs/core/modules/movement/doc/pdf_standard.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -394,7 +394,7 @@
 block discarded – undo
394 394
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
395 395
 				// Set path to the background PDF File
396 396
 				if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
397
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
397
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
398 398
 					$tplidx = $pdf->importPage(1);
399 399
 				}
400 400
 
Please login to merge, or discard this patch.
htdocs/core/modules/delivery/doc/pdf_typhon.modules.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public $version = 'dolibarr';
71 71
 
72
-	public $posxcomm;		// For customer comment column
73
-	public $posxweightvol;	// For weight or volume
72
+	public $posxcomm; // For customer comment column
73
+	public $posxweightvol; // For weight or volume
74 74
 	public $posxremainingqty;
75 75
 
76 76
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		// Define position of columns
115 115
 		$this->posxdesc = $this->marge_gauche + 1;
116
-		$this->posxcomm = 112;	// customer comment
116
+		$this->posxcomm = 112; // customer comment
117 117
 		//$this->posxtva=112;
118 118
 		//$this->posxup=126;
119 119
 		$this->posxqty = 165;
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
211 211
 				// Set path to the background PDF File
212 212
 				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
213
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
213
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
214 214
 					$tplidx = $pdf->importPage(1);
215 215
 				}
216 216
 
Please login to merge, or discard this patch.
htdocs/core/modules/delivery/doc/pdf_storm.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@
 block discarded – undo
206 206
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
207 207
 				// Set path to the background PDF File
208 208
 				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
209
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
209
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
210 210
 					$tplidx = $pdf->importPage(1);
211 211
 				}
212 212
 
Please login to merge, or discard this patch.
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@
 block discarded – undo
206 206
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
207 207
 				// Set path to the background PDF File
208 208
 				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
209
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
209
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
210 210
 					$tplidx = $pdf->importPage(1);
211 211
 				}
212 212
 
Please login to merge, or discard this patch.
htdocs/core/class/CSMSFile.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -143,10 +143,10 @@
 block discarded – undo
143 143
 		if (!getDolGlobalString('MAIN_DISABLE_ALL_SMS')) {
144 144
 			// Action according to the chose sending method
145 145
 			if (getDolGlobalString('MAIN_SMS_SENDMODE')) {
146
-				$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE');	// $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
147
-				$classmoduleofsender = getDolGlobalString('MAIN_MODULE_'.strtoupper($sendmode).'_SMS', $sendmode);	// $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'
146
+				$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE'); // $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
147
+				$classmoduleofsender = getDolGlobalString('MAIN_MODULE_'.strtoupper($sendmode).'_SMS', $sendmode); // $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'
148 148
 				if ($classmoduleofsender == 'ovh') {
149
-					$classmoduleofsender = 'ovhsms@ovh';	// For backward compatibility
149
+					$classmoduleofsender = 'ovhsms@ovh'; // For backward compatibility
150 150
 				}
151 151
 
152 152
 				$tmp = explode('@', $classmoduleofsender);
Please login to merge, or discard this patch.
htdocs/core/modules/modWebPortal.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *  \ingroup    webportal
25 25
  *  \brief      Description and activation file for module WebPortal
26 26
  */
27
-include_once DOL_DOCUMENT_ROOT . '/core/modules/DolibarrModules.class.php';
27
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
28 28
 
29 29
 /**
30 30
  *  Description and activation class for module WebPortal
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
76 76
 
77 77
 		// Key used in llx_const table to save module status enabled/disabled (where WEBPORTAL is value of property name of module in uppercase)
78
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
78
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
79 79
 
80 80
 		// Name of image file used for this module.
81 81
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 		$this->rights = array();
265 265
 		$r = 0;
266 266
 		// Add here entries to declare new permissions
267
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
267
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
268 268
 		$this->rights[$r][1] = 'Administer users of the customer/partner webportal module'; // Permission label
269 269
 		$this->rights[$r][3] = 0;
270 270
 		$this->rights[$r][4] = 'write';
Please login to merge, or discard this patch.