Dolibarr / dolibarr

htdocs/core/modules/modExpedition.class.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function __construct($db)
 	{
-		global $conf, $user;	// $conf is required by /core/extrafieldsinexport.inc.php
+		global $conf, $user; // $conf is required by /core/extrafieldsinexport.inc.php
 
 		$this->db = $db;
 		$this->numero = 80;
@@ -246,7 +246,7 @@ 
 		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'ThirdParty', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
 			'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5',
-			's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation",  'c.date_valid'=>"DateValidation",
+			's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_valid'=>"DateValidation",
 			'c.date_delivery'=>"DateDeliveryPlanned", 'c.tracking_number'=>"TrackingNumber", 'c.height'=>"Height", 'c.width'=>"Width", 'c.size'=>"Depth",
 			'c.size_units'=>'SizeUnits', 'c.weight'=>"Weight", 'c.weight_units'=>"WeightUnits", 'c.fk_statut'=>'Status', 'c.note_public'=>"NotePublic",
 			'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',

htdocs/projet/class/task.class.php

Spacing +19 added lines, -19 removed lines

@@ -405,11 +405,11 @@ 
 				$this->planned_workload = $obj->planned_workload;
 				$this->date_c = $this->db->jdate($obj->datec);
 				$this->date_start = $this->db->jdate($obj->date_start);
-				$this->date_end				= $this->db->jdate($obj->date_end);
+				$this->date_end = $this->db->jdate($obj->date_end);
 				$this->fk_user_creat		= $obj->fk_user_creat;
 				$this->fk_user_valid		= $obj->fk_user_valid;
 				$this->fk_statut		    = $obj->status;
-				$this->status			    = $obj->status;
+				$this->status = $obj->status;
 				$this->progress				= $obj->progress;
 				$this->budget_amount		= $obj->budget_amount;
 				$this->priority				= $obj->priority;
@@ -533,7 +533,7 @@ 
 						 * @param Task $task
 						 * @return bool
 						 */
-						static function ($allTasksCompleted, $task) {
+						static function($allTasksCompleted, $task) {
 							return $allTasksCompleted && $task->progress >= 100;
 						},
 						1
@@ -1161,14 +1161,14 @@ 
 						$tasks[$i]->billed = $obj->billed;
 					}
 
-					$tasks[$i]->progress		= $obj->progress;
+					$tasks[$i]->progress = $obj->progress;
 					$tasks[$i]->fk_statut		= $obj->status;
-					$tasks[$i]->status 		    = $obj->status;
+					$tasks[$i]->status = $obj->status;
 					$tasks[$i]->public = $obj->public;
 					$tasks[$i]->date_start = $this->db->jdate($obj->date_start);
 					$tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
 					$tasks[$i]->rang	   		= $obj->rang;
-					$tasks[$i]->priority   		= $obj->priority;
+					$tasks[$i]->priority = $obj->priority;
 
 					$tasks[$i]->socid           = $obj->thirdparty_id; // For backward compatibility
 					$tasks[$i]->thirdparty_id = $obj->thirdparty_id;
@@ -1489,7 +1489,7 @@ 
 			}
 
 			// Update hourly rate of this time spent entry
-			$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
+			$resql_thm_user = $this->db->query("SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $timespent->fk_user));
 			if (!empty($resql_thm_user)) {
 				$obj_thm_user = $this->db->fetch_object($resql_thm_user);
 				$timespent->thm = $obj_thm_user->thm;
@@ -1583,7 +1583,7 @@ 
 				$newobj->timespent_line_withhour = $obj->task_date_withhour;
 				$newobj->timespent_line_duration = $obj->task_duration;
 				$newobj->timespent_line_fk_user = $obj->fk_user;
-				$newobj->timespent_line_thm = $obj->thm;	// hourly rate
+				$newobj->timespent_line_thm = $obj->thm; // hourly rate
 				$newobj->timespent_line_note = $obj->note;
 
 				$arrayres[] = $newobj;
@@ -1819,7 +1819,7 @@ 
 				$newobj->timespent_withhour = $obj->task_date_withhour;
 				$newobj->timespent_duration = $obj->task_duration;
 				$newobj->timespent_fk_user = $obj->fk_user;
-				$newobj->timespent_thm = $obj->thm;	// hourly rate
+				$newobj->timespent_thm = $obj->thm; // hourly rate
 				$newobj->timespent_note = $obj->note;
 
 				$arrayres[] = $newobj;
@@ -1917,14 +1917,14 @@ 
 		if ($ret == 1 && (($this->timespent_old_duration != $this->timespent_duration) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM'))) {
 			if ($this->timespent_old_duration != $this->timespent_duration) {
 				// Recalculate amount of time spent for task and update denormalized field
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
-				$sql .= " SET duration_effective = (SELECT SUM(element_duration) FROM " . MAIN_DB_PREFIX . "element_time as ptt where ptt.elementtype = 'task' AND ptt.fk_element = " . ((int) $this->id) . ")";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+				$sql .= " SET duration_effective = (SELECT SUM(element_duration) FROM ".MAIN_DB_PREFIX."element_time as ptt where ptt.elementtype = 'task' AND ptt.fk_element = ".((int) $this->id).")";
 				if (isset($this->progress)) {
-					$sql .= ", progress = " . ((float) $this->progress); // Do not overwrite value if not provided
+					$sql .= ", progress = ".((float) $this->progress); // Do not overwrite value if not provided
 				}
-				$sql .= " WHERE rowid = " . ((int) $this->id);
+				$sql .= " WHERE rowid = ".((int) $this->id);
 
-				dol_syslog(get_class($this) . "::updateTimeSpent", LOG_DEBUG);
+				dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
 				if (!$this->db->query($sql)) {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
@@ -1935,7 +1935,7 @@ 
 			// Update hourly rate of this time spent entry, but only if it was not set initially
 			$res_update = 1;
 			if (empty($timespent->thm) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM')) {
-				$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
+				$resql_thm_user = $this->db->query("SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $timespent->fk_user));
 				if (!empty($resql_thm_user)) {
 					$obj_thm_user = $this->db->fetch_object($resql_thm_user);
 					$timespent->thm = $obj_thm_user->thm;
@@ -2072,8 +2072,8 @@ 
 
 		$defaultref = '';
 		$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
-			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').'.php';
+		if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
+			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').'.php';
 			$modTask = new $obj();
 			$defaultref = $modTask->getNextValue(0, $clone_task);
 		}
@@ -2122,7 +2122,7 @@ 
 		}
 		// End
 		if ($error) {
-			$clone_task_id = 0;  // For static tool check
+			$clone_task_id = 0; // For static tool check
 		} else {
 			$clone_task_id = $clone_task->id;
 			$clone_task_ref = $clone_task->ref;
@@ -2571,7 +2571,7 @@ 
 		global $conf, $langs, $hookmanager, $user, $action;
 
 		$error = 0;
-		$task_origin = new Task($this->db);		// The thirdparty that we will delete
+		$task_origin = new Task($this->db); // The thirdparty that we will delete
 
 		dol_syslog("mergeTask merge task id=".$task_origin_id." (will be deleted) into the task id=".$this->id);
 

dev/tools/apstats.php

Spacing +11 added lines, -11 removed lines

@@ -27,12 +27,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = dirname(__FILE__) . '/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit();
 }
 
@@ -928,19 +928,19 @@ 
 	fwrite($fh, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 	fwrite($fh, '<rss version="2.0">'."\n");
 	fwrite($fh, '<channel>'."\n");
-	fwrite($fh, '<title>' . htmlspecialchars($title_security) . '</title>'."\n");
-	fwrite($fh, '<description>' . htmlspecialchars("Feed of the latest security reports on the project") . '</description>'."\n");
+	fwrite($fh, '<title>'.htmlspecialchars($title_security).'</title>'."\n");
+	fwrite($fh, '<description>'.htmlspecialchars("Feed of the latest security reports on the project").'</description>'."\n");
 	if ($url_site) {
-		fwrite($fh, '<link>' . htmlspecialchars($url_site) . '</link>'."\n");
+		fwrite($fh, '<link>'.htmlspecialchars($url_site).'</link>'."\n");
 	}
 	if ($url_flux) {
-		fwrite($fh, '<atom:link href="' . htmlspecialchars($url_flux) . '" rel="self" type="application/rss+xml" />'."\n");
+		fwrite($fh, '<atom:link href="'.htmlspecialchars($url_flux).'" rel="self" type="application/rss+xml" />'."\n");
 	}
 	// Image
 	fwrite($fh, '<image>'."\n");
 	fwrite($fh, '<url>https://www.dolibarr.org/medias/image/www.dolibarr.org/badge-openssf.png</url>'."\n");
 	if ($url_site) {
-		fwrite($fh, '<link>' . htmlspecialchars($url_site) . '</link>'."\n");
+		fwrite($fh, '<link>'.htmlspecialchars($url_site).'</link>'."\n");
 	}
 	fwrite($fh, '</image>'."\n");
 
@@ -948,10 +948,10 @@ 
 		$alert['url_commit'] = 'https://github.com/Dolibarr/dolibarr/commit/'.$alert['commitid'];
 
 		fwrite($fh, '<item>'."\n");
-		fwrite($fh, '<title>' . htmlspecialchars($alert['title']) . '</title>'."\n");
-		fwrite($fh, '<description>' . $alert['description'] . '</description>'."\n");	// no htmlspeciachars here
-		fwrite($fh, '<link>' . htmlspecialchars($alert['url_commit']) . '</link>'."\n");
-		fwrite($fh, '<pubDate>' . htmlspecialchars($alert['created_at']) . '</pubDate>'."\n");
+		fwrite($fh, '<title>'.htmlspecialchars($alert['title']).'</title>'."\n");
+		fwrite($fh, '<description>'.$alert['description'].'</description>'."\n"); // no htmlspeciachars here
+		fwrite($fh, '<link>'.htmlspecialchars($alert['url_commit']).'</link>'."\n");
+		fwrite($fh, '<pubDate>'.htmlspecialchars($alert['created_at']).'</pubDate>'."\n");
 		fwrite($fh, '</item>'."\n");
 	}