Dolibarr / dolibarr

htdocs/blockedlog/class/blockedlog.class.php

Spacing +11 added lines, -11 removed lines

@@ -530,7 +530,7 @@ 
 			'linkedObjectsIds',
 			'linkedObjects',
 			'fk_delivery_address',
-			'projet',          // There is already ->fk_project
+			'projet', // There is already ->fk_project
 			'restrictiononfksoc',
 			'specimen',
 		);
@@ -977,18 +977,18 @@ 
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) {
-				$this->id 				= $obj->rowid;
-				$this->entity 			= $obj->entity;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
 
-				$this->date_creation 	= $this->db->jdate($obj->date_creation);	// jdate(date_creation)is UTC
-				$this->date_modification = $this->db->jdate($obj->tms);				// jdate(tms) is UTC
+				$this->date_creation = $this->db->jdate($obj->date_creation); // jdate(date_creation)is UTC
+				$this->date_modification = $this->db->jdate($obj->tms); // jdate(tms) is UTC
 
 				$this->amounts			= (float) $obj->amounts;
 				$this->action 			= $obj->action;
 				$this->element			= $obj->element;
 
 				$this->fk_object = $obj->fk_object;
-				$this->date_object = $this->db->jdate($obj->date_object);			// jdate(date_object) is UTC
+				$this->date_object = $this->db->jdate($obj->date_object); // jdate(date_object) is UTC
 				$this->ref_object = $obj->ref_object;
 
 				$this->fk_user = $obj->fk_user;
@@ -1127,17 +1127,17 @@ 
 
 		$this->object_version = DOL_VERSION;
 		// The object_format define the formatting rules into buildKeyForSignature and buildFirstPartOfKeyForSignature and buildFinalSignatureHash
-		$this->object_format = 'V1';	// TODO Switch to V2 when v2 support is complete
+		$this->object_format = 'V1'; // TODO Switch to V2 when v2 support is complete
 
 		try {
 			$previoushash = $this->getPreviousHash(1, 0); // This get last record and lock database until insert is done and transaction closed
 
-			$concatenateddata = $this->buildKeyForSignature();	// All the information for the hash (meta data + data saved)
+			$concatenateddata = $this->buildKeyForSignature(); // All the information for the hash (meta data + data saved)
 
-			$this->signature = $this->buildFinalSignatureHash($previoushash.$concatenateddata);	// Build the hmac signature
+			$this->signature = $this->buildFinalSignatureHash($previoushash.$concatenateddata); // Build the hmac signature
 
 			// For debug:
-			$this->debuginfo = $this->buildFirstPartOfKeyForSignature();	// Not used
+			$this->debuginfo = $this->buildFirstPartOfKeyForSignature(); // Not used
 		} catch (Exception $e) {
 			$this->error = $e->getMessage();
 
@@ -1168,7 +1168,7 @@ 
 		$sql .= " fk_user,";
 		$sql .= " user_fullname,";
 		$sql .= " entity,";
-		$sql .= " debuginfo";	// Only stored
+		$sql .= " debuginfo"; // Only stored
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($this->date_creation)."',";
 		$sql .= "'".$this->db->escape($this->action)."',";

htdocs/blockedlog/admin/blockedlog_archives.php

Spacing +13 added lines, -13 removed lines

@@ -134,7 +134,7 @@ 
 $MAXFORSHOWNLINKS = getDolGlobalInt('BLOCKEDLOG_MAX_FOR_SHOWN_LINKS', 100);
 
 $permission = $user->hasRight('blockedlog', 'read');
-$permissiontoadd = $user->hasRight('blockedlog', 'read');	// Permission is to upload new files to scan them
+$permissiontoadd = $user->hasRight('blockedlog', 'read'); // Permission is to upload new files to scan them
 $permtoedit = $permissiontoadd;
 
 $upload_dir = getMultidirOutput($block_static, 'blockedlog').'/archives';
@@ -175,7 +175,7 @@ 
 	$previoushash = '';
 	$firstid = '';
 
-	if (! (GETPOSTINT('yeartoexport') > 0)) {
+	if (!(GETPOSTINT('yeartoexport') > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Year")), null, "errors");
 		$error++;
 	}
@@ -308,13 +308,13 @@ 
 				$block_static->id = $obj->rowid;
 				$block_static->entity = $obj->entity;
 
-				$block_static->date_creation = $db->jdate($obj->date_creation);		// jdate(date_creation) is UTC
+				$block_static->date_creation = $db->jdate($obj->date_creation); // jdate(date_creation) is UTC
 
-				$block_static->amounts = (float) $obj->amounts;						// Database store value with 8 digits, we cut ending 0 them with (flow)
+				$block_static->amounts = (float) $obj->amounts; // Database store value with 8 digits, we cut ending 0 them with (flow)
 				$block_static->vat = $obj->vat;
 
 				$block_static->action = $obj->action;
-				$block_static->date_object = $db->jdate($obj->date_object);			// jdate(date_object) is UTC
+				$block_static->date_object = $db->jdate($obj->date_object); // jdate(date_object) is UTC
 				$block_static->ref_object = $obj->ref_object;
 
 				$block_static->user_fullname = $obj->user_fullname;
@@ -324,14 +324,14 @@ 
 				// Old hash + Previous fields concatenated = signature
 				$block_static->signature = $obj->signature;
 
-				$block_static->element = $obj->element;								// Not in signature
-				$block_static->fk_object = $obj->fk_object;							// Not in signature
+				$block_static->element = $obj->element; // Not in signature
+				$block_static->fk_object = $obj->fk_object; // Not in signature
 
-				$block_static->fk_user = $obj->fk_user;								// Not in signature
+				$block_static->fk_user = $obj->fk_user; // Not in signature
 
-				$block_static->date_modification = $db->jdate($obj->tms);			// Not in signature
-				$block_static->object_version = $obj->object_version;				// Not in signature
-				$block_static->object_format = $obj->object_format;					// Not in signature
+				$block_static->date_modification = $db->jdate($obj->tms); // Not in signature
+				$block_static->object_version = $obj->object_version; // Not in signature
+				$block_static->object_format = $obj->object_format; // Not in signature
 
 				$block_static->certified = ($obj->certified == 1);
 
@@ -341,7 +341,7 @@ 
 				$block_static->debuginfo = $obj->debuginfo;
 
 				//var_dump($block->id.' '.$block->signature, $block->object_data);
-				$checksignature = $block_static->checkSignature($previoushash); 	// If $previoushash is not defined, checkSignature will search it
+				$checksignature = $block_static->checkSignature($previoushash); // If $previoushash is not defined, checkSignature will search it
 
 				if ($checksignature) {
 					$statusofrecord = 'Valid';
@@ -363,7 +363,7 @@ 
 				$concatenateddata = $block_static->buildKeyForSignature();
 
 				// Version archive V1=sha256
-				$signatureexport = dol_hash($previoushash.$concatenateddata, 'sha256');		// SHA256
+				$signatureexport = dol_hash($previoushash.$concatenateddata, 'sha256'); // SHA256
 				//$signatureexporthmac = 'TODO';
 
 				fwrite($fh,

htdocs/blockedlog/admin/blockedlog_list.php

Spacing +13 added lines, -13 removed lines

@@ -64,7 +64,7 @@ 
 $search_endyear = GETPOSTINT('search_endyear');
 $search_endmonth = GETPOSTINT('search_endmonth');
 $search_endday = GETPOSTINT('search_endday');
-$search_id = GETPOST('search_id', 'alpha');					// Can be a USF search string
+$search_id = GETPOST('search_id', 'alpha'); // Can be a USF search string
 $search_fk_user = GETPOST('search_fk_user', 'intcomma');
 $search_start = -1;
 if (GETPOST('search_startyear') != '') {
@@ -159,7 +159,7 @@ 
 	$previoushash = '';
 	$firstid = '';
 
-	if (! (GETPOSTINT('yeartoexport') > 0)) {
+	if (!(GETPOSTINT('yeartoexport') > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Year")), null, "errors");
 		$error++;
 	} else {
@@ -192,7 +192,7 @@ 
 		}
 	}
 
-	if (! $error) {
+	if (!$error) {
 		// We record the export as a new line into the unalterable logs
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 		$b = new BlockedLog($db);
@@ -272,13 +272,13 @@ 
 				$block_static->entity = $obj->entity;
 
 
-				$block_static->date_creation = $db->jdate($obj->date_creation);		// TODO Use gmt
+				$block_static->date_creation = $db->jdate($obj->date_creation); // TODO Use gmt
 
-				$block_static->amounts = (float) $obj->amounts;						// Database store value with 8 digits, we cut ending 0 them with (flow)
+				$block_static->amounts = (float) $obj->amounts; // Database store value with 8 digits, we cut ending 0 them with (flow)
 				$block_static->vat = $obj->vat;
 
 				$block_static->action = $obj->action;
-				$block_static->date_object = $db->jdate($obj->date_object);			// TODO Use gmt ?
+				$block_static->date_object = $db->jdate($obj->date_object); // TODO Use gmt ?
 				$block_static->ref_object = $obj->ref_object;
 
 				$block_static->user_fullname = $obj->user_fullname;
@@ -288,14 +288,14 @@ 
 				// Old hash + Previous fields concatenated = signature
 				$block_static->signature = $obj->signature;
 
-				$block_static->element = $obj->element;								// Not in signature
-				$block_static->fk_object = $obj->fk_object;							// Not in signature
+				$block_static->element = $obj->element; // Not in signature
+				$block_static->fk_object = $obj->fk_object; // Not in signature
 
-				$block_static->fk_user = $obj->fk_user;								// Not in signature
+				$block_static->fk_user = $obj->fk_user; // Not in signature
 
-				$block_static->date_modification = $db->jdate($obj->tms);			// Not in signature
-				$block_static->object_version = $obj->object_version;				// Not in signature
-				$block_static->object_format = $obj->object_format;					// Not in signature
+				$block_static->date_modification = $db->jdate($obj->tms); // Not in signature
+				$block_static->object_version = $obj->object_version; // Not in signature
+				$block_static->object_format = $obj->object_format; // Not in signature
 
 				$block_static->certified = ($obj->certified == 1);
 
@@ -765,7 +765,7 @@ 
 			// Link to debug information object
 			if (getDolGlobalString("BLOCKEDLOG_DEBUG")) {	// If in experimental or develop mode, we add some debug information. It may help developers to find origin of bugs.
 				print '<td class="tdoverflowmax150"'.(preg_match('/<a/', $object_link) ? '' : 'title="'.dol_escape_htmltag(dol_string_nohtmltag($object_link.($object_link_title ? ' - '.$object_link_title : ''))).'"').'>';
-				print '<!-- object_link -->';	// $object_link can be a '<a href' link or a text
+				print '<!-- object_link -->'; // $object_link can be a '<a href' link or a text
 				print $object_link;
 				print '</td>';
 			}