Dolibarr / dolibarr

htdocs/core/class/commoninvoice.class.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -723,7 +723,7 @@
 
 		// If not a draft invoice and not temporary invoice
 		if ($tmppart !== 'PROV') {
-			if ($this instanceOf Facture) {
+			if ($this instanceof Facture) {
 				/* @var Facture $this */
 				// If sent by email, we refuse
 				if ((int) $this->email_sent_counter > 0) {

htdocs/core/modules/modEventOrganization.class.php

Spacing +46 added lines, -46 removed lines

@@ -232,82 +232,82 @@ 
 		/* END MODULEBUILDER TOPMENU */
 		/* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'EventOrganizationMenuLeft',
 			'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'),
 			'mainmenu' => 'project',
 			'leftmenu' => 'eventorganization',
 			'url' => '',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "read")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'New',
 			'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
-			'langs' => 'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "write")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'List',
 			'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
-			'langs' => 'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "write")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'ConferenceOrBooth',
 			'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'),
 			'mainmenu' => 'project',
 			'leftmenu' => 'eventorganizationconforbooth',
 			'url' => '',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "read")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'New',
 			'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "write")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'List',
 			'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "read")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		/* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */
 
@@ -317,7 +317,7 @@ 
 		/* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTHATTENDEES */
 		$langs->load("eventorganization");
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
-		$this->export_label[$r] = 'ListOfAttendeesOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_label[$r] = 'ListOfAttendeesOfEvent'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r] = $this->picto;
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
 		$keyforclass = 'ConferenceOrBoothAttendee';
@@ -325,8 +325,8 @@ 
 		$keyforelement = 'conferenceorboothattendee';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
 		$this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
-		unset($this->export_fields_array[$r]['t.fk_project']);	// Remove field so we can add it at end just after
-		unset($this->export_fields_array[$r]['t.fk_soc']);	// Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
 		$this->export_fields_array[$r]['t.fk_invoice'] = 'InvoiceId';
 		$this->export_fields_array[$r]['t.fk_project'] = 'ProjectId';
 		$this->export_fields_array[$r]['p.ref'] = 'ProjectRef';
@@ -340,9 +340,9 @@ 
 		$this->export_TypeFields_array[$r]['t.fk_soc'] = 'Numeric';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
-		$keyforselect = 'eventorganization_conferenceorboothattendee';		// The value in column elementtype of llx_extrafields table
+		$keyforselect = 'eventorganization_conferenceorboothattendee'; // The value in column elementtype of llx_extrafields table
 		$keyforaliasextra = 'extra';
-		$keyforelement = 'conferenceorboothattendee';						// The value of key for icon and class
+		$keyforelement = 'conferenceorboothattendee'; // The value of key for icon and class
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		//$this->export_dependencies_array[$r] = array('aaaline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
 		//$this->export_special_array[$r] = array('t.field'=>'...');
@@ -358,16 +358,16 @@ 
 		/* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTH */
 		$langs->load("eventorganization");
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
-		$this->export_label[$r] = 'ListOfConfOrBoothOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_label[$r] = 'ListOfConfOrBoothOfEvent'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r] = 'conferenceorbooth';
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
 		$keyforclass = 'ConferenceOrBooth';
 		$keyforclassfile = '/eventorganization/class/conferenceorbooth.class.php';
 		$keyforelement = 'conferenceorbooth';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		unset($this->export_fields_array[$r]['t.fk_action']);	// Remove field so we can add it at end just after
-		unset($this->export_fields_array[$r]['t.fk_project']);	// Remove field so we can add it at end just after
-		unset($this->export_fields_array[$r]['t.fk_soc']);	// Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_action']); // Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
 		$this->export_fields_array[$r]['t.fk_action'] = 'ConferenceOrBoothFormatID';
 		$this->export_fields_array[$r]['ca.code'] = 'ConferenceOrBoothFormatCode';
 		$this->export_fields_array[$r]['ca.libelle'] = 'ConferenceOrBoothFormatLabel';
@@ -389,7 +389,7 @@ 
 		$this->export_TypeFields_array[$r]['s.nom'] = 'Text';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
-		$keyforselect = 'actioncomm';		// The value in column elementtype of llx_extrafields table
+		$keyforselect = 'actioncomm'; // The value in column elementtype of llx_extrafields table
 		$keyforaliasextra = 'extra';
 		$keyforelement = 'conferenceorbooth';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';

htdocs/projet/class/api_tasks.class.php

Spacing +36 added lines, -36 removed lines

@@ -80,7 +80,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if ($includetimespent == 1) {
@@ -130,19 +130,19 @@ 
 		}
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS t";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "projet AS p ON p.rowid = t.fk_projet";
-		$sql .= ' WHERE t.entity IN (' . getEntity('project') . ')';
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task AS t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet AS p ON p.rowid = t.fk_projet";
+		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
 		if ($socids) {
-			$sql .= " AND t.fk_soc IN (" . $this->db->sanitize((string) $socids) . ")";
+			$sql .= " AND t.fk_soc IN (".$this->db->sanitize((string) $socids).")";
 		}
 		// Search on sale representative
 		if ($search_sale && $search_sale != '-1') {
 			if ($search_sale == -2) {
-				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
+				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
 			} elseif ($search_sale > 0) {
-				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
 			}
 		}
 		// Add sql filters
@@ -150,7 +150,7 @@ 
 			$errormessage = '';
 			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
 			if ($errormessage) {
-				throw new RestException(400, 'Error when validating parameter sqlfilters -> ' . $errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 		}
 
@@ -180,7 +180,7 @@ 
 				$i++;
 			}
 		} else {
-			throw new RestException(503, 'Error when retrieve task list : ' . $this->db->lasterror());
+			throw new RestException(503, 'Error when retrieve task list : '.$this->db->lasterror());
 		}
 
 		return $obj_ret;
@@ -239,16 +239,16 @@ 
 				}
 			}
 			if ($filefound && !empty($classname)) {
-				$result = dol_include_once($reldir . "core/modules/project/task/" . $modele . '.php');
+				$result = dol_include_once($reldir."core/modules/project/task/".$modele.'.php');
 				if ($result !== false && class_exists($classname)) {
 					$modTask = new $classname();
 					'@phan-var-force ModeleNumRefTask $modTask';
 					$defaultref = $modTask->getNextValue(null, $this->task);
 				} else {
-					dol_syslog("Failed to include module file or invalid classname: " . $reldir . "core/modules/project/task/" . $modele . '.php', LOG_ERR);
+					dol_syslog("Failed to include module file or invalid classname: ".$reldir."core/modules/project/task/".$modele.'.php', LOG_ERR);
 				}
 			} else {
-				dol_syslog("Module file not found or classname is empty: " . $modele, LOG_ERR);
+				dol_syslog("Module file not found or classname is empty: ".$modele, LOG_ERR);
 			}
 
 			if (is_numeric($defaultref) && $defaultref <= 0) {
@@ -256,7 +256,7 @@ 
 			}
 
 			if (empty($defaultref)) {
-				$defaultref = 'TK' . dol_print_date(dol_now(), 'dayrfc');
+				$defaultref = 'TK'.dol_print_date(dol_now(), 'dayrfc');
 			}
 
 			$this->task->ref = $defaultref;
@@ -289,7 +289,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('tasks', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->task->fetchTimeSpentOnTask();
@@ -327,7 +327,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('tasks', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$usert = DolibarrApiAccess::$user;
@@ -500,7 +500,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
 			if ($field == 'id') {
@@ -549,11 +549,11 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if ($this->task->delete(DolibarrApiAccess::$user) <= 0) {
-			throw new RestException(500, 'Error when delete task : ' . $this->task->error);
+			throw new RestException(500, 'Error when delete task : '.$this->task->error);
 		}
 
 		return array(
@@ -579,12 +579,12 @@ 
 	public function getTimeSpentByID($id, $timespent_id)
 	{
 		dol_syslog("API Rest request::getTimeSpent", LOG_DEBUG);
-		if (! DolibarrApiAccess::$user->hasRight('projet', 'lire')) {
+		if (!DolibarrApiAccess::$user->hasRight('projet', 'lire')) {
 			throw new RestException(403);
 		}
 
 		$taskresult = $this->task->fetch($id);
-		if (!$taskresult ) {
+		if (!$taskresult) {
 			throw new RestException(404, 'Task with id='.$id.' not found');
 		}
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
@@ -593,7 +593,7 @@ 
 
 		$timespent = new TimeSpent($this->db);
 		$timeresult = $timespent->fetch($timespent_id);
-		if (!$timeresult ) {
+		if (!$timeresult) {
 			throw new RestException(404, 'Timespent with id='.$timespent_id.' not found');
 		}
 		if (!DolibarrApi::_checkAccessToResource('time', $timespent->id)) {
@@ -634,7 +634,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('project', $this->task->fk_project)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$uid = $user_id;
@@ -648,18 +648,18 @@ 
 		$this->task->timespent_datehour = $newdate;
 		$this->task->timespent_withhour = 1;
 		$this->task->timespent_duration = $duration;
-		$this->task->timespent_fk_product  = $product_id;
+		$this->task->timespent_fk_product = $product_id;
 		$this->task->timespent_fk_user  = $uid;
 		$this->task->timespent_note     = $note;
 		if (!empty($this->task->progress))
-			$this->task->progress  		= $progress;
+			$this->task->progress = $progress;
 
 		$result = $this->task->addTimeSpent(DolibarrApiAccess::$user, 0);
 		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
-			throw new RestException(500, 'Error when adding time: ' . $this->task->error);
+			throw new RestException(500, 'Error when adding time: '.$this->task->error);
 		}
 
 		return array(
@@ -698,7 +698,7 @@ 
 		$this->timespentRecordChecks($id, $timespent_id);
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$newdate = dol_stringtotime($date, 1);
@@ -706,7 +706,7 @@ 
 		$this->task->timespent_datehour = $newdate;
 		$this->task->timespent_withhour = 1;
 		$this->task->timespent_duration = $duration;
-		$this->task->timespent_fk_product  = $product_id;
+		$this->task->timespent_fk_product = $product_id;
 		$this->task->timespent_fk_user  = $user_id ?? DolibarrApiAccess::$user->id;
 		$this->task->timespent_note     = $note;
 
@@ -715,7 +715,7 @@ 
 			throw new RestException(304, 'Error nothing done.');
 		}
 		if ($result < 0) {
-			throw new RestException(500, 'Error when updating time spent: ' . $this->task->error);
+			throw new RestException(500, 'Error when updating time spent: '.$this->task->error);
 		}
 
 		return array(
@@ -746,11 +746,11 @@ 
 		$this->timespentRecordChecks($id, $timespent_id);
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		if ($this->task->delTimeSpent(DolibarrApiAccess::$user, 0) < 0) {
-			throw new RestException(500, 'Error when deleting time spent: ' . $this->task->error);
+			throw new RestException(500, 'Error when deleting time spent: '.$this->task->error);
 		}
 
 		return array(
@@ -1010,7 +1010,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$contacts = $this->task->liste_contact(-1, 'external', 0, $type);
@@ -1018,7 +1018,7 @@ 
 
 		$contacts = array_merge($contacts, $socpeoples);
 
-		return $contacts;	// Return array
+		return $contacts; // Return array
 	}
 
 	/**
@@ -1051,12 +1051,12 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->task->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
 		if ($result <= 0) {
-			throw new RestException(500, 'Error : ' . $this->task->error);
+			throw new RestException(500, 'Error : '.$this->task->error);
 		}
 
 		$result = $this->task->fetch($id);
@@ -1094,7 +1094,7 @@ 
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
-			throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach (array('internal', 'external') as $source) {

Braces +3 added lines, -2 removed lines

@@ -651,8 +651,9 @@
 		$this->task->timespent_fk_product  = $product_id;
 		$this->task->timespent_fk_user  = $uid;
 		$this->task->timespent_note     = $note;
-		if (!empty($this->task->progress))
-			$this->task->progress  		= $progress;
+		if (!empty($this->task->progress)) {
+					$this->task->progress  		= $progress;
+		}
 
 		$result = $this->task->addTimeSpent(DolibarrApiAccess::$user, 0);
 		if ($result == 0) {

htdocs/projet/class/task.class.php

Spacing +21 added lines, -21 removed lines

@@ -589,7 +589,7 @@ 
 				$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->status			    = $obj->status;
+				$this->status = $obj->status;
 				$this->progress				= $obj->progress;
 				$this->budget_amount		= $obj->budget_amount;
 				$this->priority				= $obj->priority;
@@ -725,7 +725,7 @@ 
 						 * @param Task $task
 						 * @return bool
 						 */
-						static function ($allTasksCompleted, $task) {
+						static function($allTasksCompleted, $task) {
 							return $allTasksCompleted && $task->progress >= 100;
 						},
 						1
@@ -1359,14 +1359,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;
@@ -1710,7 +1710,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;
@@ -1792,8 +1792,8 @@ 
 				$newobj->fk_project			= $obj->project_id;
 				$newobj->project_ref		= $obj->project_ref;
 				$newobj->project_label = $obj->project_label;
-				$newobj->project_public		= $obj->project_public;
-				$newobj->public				= $obj->project_public;		// deprecated
+				$newobj->project_public = $obj->project_public;
+				$newobj->public				= $obj->project_public; // deprecated
 
 				$newobj->fk_task			= $obj->task_id;
 				$newobj->task_ref = $obj->task_ref;
@@ -1807,7 +1807,7 @@ 
 				$newobj->timespent_line_duration = $obj->task_duration;
 				$newobj->timespent_line_fk_user = $obj->fk_user;
 				$newobj->timespent_line_fk_product = $obj->fk_product;
-				$newobj->timespent_line_thm = $obj->thm;	// hourly rate
+				$newobj->timespent_line_thm = $obj->thm; // hourly rate
 				$newobj->timespent_line_note = $obj->note;
 
 				$arrayres[] = $newobj;
@@ -2046,7 +2046,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;
@@ -2110,7 +2110,7 @@ 
 		$timespent->element_date = $this->timespent_date;
 		$timespent->element_datehour = $this->timespent_datehour;
 
-		$timespent->element_date_withhour = $this->timespent_withhour;		// 0 or 1
+		$timespent->element_date_withhour = $this->timespent_withhour; // 0 or 1
 		$timespent->element_duration = $this->timespent_duration;
 		if ($this->timespent_fk_user > 0) {
 			$timespent->fk_user = $this->timespent_fk_user;
@@ -2146,14 +2146,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();
@@ -2164,7 +2164,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;
@@ -2301,8 +2301,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();
 			'@phan-var-force ModeleNumRefTask $modTask';
 			$defaultref = $modTask->getNextValue(null, $clone_task);
@@ -2352,7 +2352,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;
@@ -2792,7 +2792,7 @@ 
 		global $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);