Dolibarr / dolibarr

htdocs/webportal/class/controller.class.php

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
  */
 
  /**
- * \file       htdocs/webportal/class/controller.class.php
- * \ingroup    webportal
- * \brief      File of controller class for WebPortal
- */
+  * \file       htdocs/webportal/class/controller.class.php
+  * \ingroup    webportal
+  * \brief      File of controller class for WebPortal
+  */
 
 /**
  *  Class to manage pages

htdocs/webportal/class/context.class.php

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
  */
 
  /**
- * \file       htdocs/webportal/class/context.class.php
- * \ingroup    webportal
- * \brief      File of context class for WebPortal
- */
+  * \file       htdocs/webportal/class/context.class.php
+  * \ingroup    webportal
+  * \brief      File of context class for WebPortal
+  */
 
 require_once __DIR__ . '/controller.class.php';
 require_once __DIR__ . '/webPortalTheme.class.php';

Spacing +32 added lines, -32 removed lines

@@ -22,8 +22,8 @@ 
  * \brief      File of context class for WebPortal
  */
 
-require_once __DIR__ . '/controller.class.php';
-require_once __DIR__ . '/webPortalTheme.class.php';
+require_once __DIR__.'/controller.class.php';
+require_once __DIR__.'/webPortalTheme.class.php';
 
 /**
  * Class Context
@@ -160,16 +160,16 @@ 
 
 		$this->db = $db;
 
-		$this->tplDir = __DIR__ . '/../';
+		$this->tplDir = __DIR__.'/../';
 
 		$this->getControllerUrl();
 
 		$this->topMenu = new stdClass();
 
-		$this->tplPath = realpath(__DIR__ . '/../../public/webportal/tpl');
+		$this->tplPath = realpath(__DIR__.'/../../public/webportal/tpl');
 
 		$this->controller = GETPOST('controller', 'aZ09'); // for security, limited to 'aZ09'
-		$this->action = GETPOST('action', 'aZ09');// for security, limited to 'aZ09'
+		$this->action = GETPOST('action', 'aZ09'); // for security, limited to 'aZ09'
 
 		if (empty($this->controller)) {
 			$this->controller = 'default';
@@ -211,17 +211,17 @@ 
 	{
 		global $db, $conf, $langs;
 
-		$defaultControllersPath = __DIR__ . '/../controllers/';
+		$defaultControllersPath = __DIR__.'/../controllers/';
 
 		// define controllers definition
-		$this->addControllerDefinition('login', $defaultControllersPath . 'login.controller.class.php', 'LoginController');
-		$this->addControllerDefinition('default', $defaultControllersPath . 'default.controller.class.php', 'DefaultController');
-		$this->addControllerDefinition('document', $defaultControllersPath . 'document.controller.class.php', 'DocumentController');
-		$this->addControllerDefinition('propallist', $defaultControllersPath . 'propallist.controller.class.php', 'PropalListController');
-		$this->addControllerDefinition('orderlist', $defaultControllersPath . 'orderlist.controller.class.php', 'OrderListController');
-		$this->addControllerDefinition('invoicelist', $defaultControllersPath . 'invoicelist.controller.class.php', 'InvoiceListController');
-		$this->addControllerDefinition('membercard', $defaultControllersPath . 'membercard.controller.class.php', 'MemberCardController');
-		$this->addControllerDefinition('partnershipcard', $defaultControllersPath . 'partnershipcard.controller.class.php', 'PartnershipCardController');
+		$this->addControllerDefinition('login', $defaultControllersPath.'login.controller.class.php', 'LoginController');
+		$this->addControllerDefinition('default', $defaultControllersPath.'default.controller.class.php', 'DefaultController');
+		$this->addControllerDefinition('document', $defaultControllersPath.'document.controller.class.php', 'DocumentController');
+		$this->addControllerDefinition('propallist', $defaultControllersPath.'propallist.controller.class.php', 'PropalListController');
+		$this->addControllerDefinition('orderlist', $defaultControllersPath.'orderlist.controller.class.php', 'OrderListController');
+		$this->addControllerDefinition('invoicelist', $defaultControllersPath.'invoicelist.controller.class.php', 'InvoiceListController');
+		$this->addControllerDefinition('membercard', $defaultControllersPath.'membercard.controller.class.php', 'MemberCardController');
+		$this->addControllerDefinition('partnershipcard', $defaultControllersPath.'partnershipcard.controller.class.php', 'PartnershipCardController');
 
 		// call triggers
 		//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
@@ -255,7 +255,7 @@ 
 		$length = strlen($needle);
 		$isControllerFile = $length > 0 ? substr($fileName, -$length) === $needle : true;
 		if (!$isControllerFile) {
-			$this->setError('Error: controller definition ' . $fileName);
+			$this->setError('Error: controller definition '.$fileName);
 			return false;
 		}
 
@@ -375,9 +375,9 @@ 
 		if (!empty($Tparams)) {
 			$TCompiledAttr = array();
 			foreach ($Tparams as $key => $value) {
-				$TCompiledAttr[] = $key . '=' . $value;
+				$TCompiledAttr[] = $key.'='.$value;
 			}
-			$url .= '?' . implode("&", $TCompiledAttr);
+			$url .= '?'.implode("&", $TCompiledAttr);
 		}
 
 		// if $moreParams is a string
@@ -405,13 +405,13 @@ 
 
 		$ssl = (!empty($s['HTTPS']) && $s['HTTPS'] == 'on');
 		$sp = strtolower($s['SERVER_PROTOCOL']);
-		$protocol = substr($sp, 0, strpos($sp, '/')) . (($ssl) ? 's' : '');
+		$protocol = substr($sp, 0, strpos($sp, '/')).(($ssl) ? 's' : '');
 		$port = $s['SERVER_PORT'];
-		$port = ((!$ssl && $port == '80') || ($ssl && $port == '443')) ? '' : ':' . $port;
+		$port = ((!$ssl && $port == '80') || ($ssl && $port == '443')) ? '' : ':'.$port;
 		$host = ($use_forwarded_host && isset($s['HTTP_X_FORWARDED_HOST'])) ? $s['HTTP_X_FORWARDED_HOST'] : (isset($s['HTTP_HOST']) ? $s['HTTP_HOST'] : null);
-		$host = isset($host) ? $host : $s['SERVER_NAME'] . $port;
+		$host = isset($host) ? $host : $s['SERVER_NAME'].$port;
 
-		$url = $protocol . '://' . $host;
+		$url = $protocol.'://'.$host;
 
 		if ($withRequestUri) {
 			$url .= $s['REQUEST_URI'];
@@ -530,10 +530,10 @@ 
 	public function setEventMessages($mesg, $mesgs, $style = 'mesgs')
 	{
 		if (empty($mesg) && empty($mesgs)) {
-			dol_syslog(__METHOD__ . ' Try to add a message in stack, but value to add is empty message', LOG_WARNING);
+			dol_syslog(__METHOD__.' Try to add a message in stack, but value to add is empty message', LOG_WARNING);
 		} else {
 			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
-				dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+				dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
 			}
 			if (empty($mesgs)) {
 				$this->setEventMessage($mesg, $style);
@@ -593,7 +593,7 @@ 
 	{
 		$currentToken = $this->newToken();
 		// Creation of a token against CSRF vulnerabilities
-		if (!defined('NOTOKENRENEWAL') || empty($currentToken) ) {
+		if (!defined('NOTOKENRENEWAL') || empty($currentToken)) {
 			// Rolling token at each call ($_SESSION['token'] contains token of previous page)
 			if (isset($_SESSION['newtoken'])) {
 				$_SESSION['token'] = $_SESSION['newtoken'];
@@ -618,7 +618,7 @@ 
 	{
 		$token = $this->newToken();
 		if ($token) {
-			return '&' . $this->tokenKey . '=' . $this->newToken();
+			return '&'.$this->tokenKey.'='.$this->newToken();
 		}
 
 		return null;
@@ -633,7 +633,7 @@ 
 	{
 		$token = $this->newToken();
 		if ($token) {
-			return '<input type="hidden" name="' . $this->tokenKey . '" value="' . $this->newToken() . '" />';
+			return '<input type="hidden" name="'.$this->tokenKey.'" value="'.$this->newToken().'" />';
 		}
 
 		return null;
@@ -651,14 +651,14 @@ 
 		$id = 0;
 
 		$sql = "SELECT sa.rowid as id, sa.pass_crypted";
-		$sql .= " FROM " . $this->db->prefix() . "societe_account as sa";
-		$sql .= " WHERE BINARY sa.login = '" . $this->db->escape($login) . "'"; // case sensitive
+		$sql .= " FROM ".$this->db->prefix()."societe_account as sa";
+		$sql .= " WHERE BINARY sa.login = '".$this->db->escape($login)."'"; // case sensitive
 		//$sql .= " AND BINARY sa.pass_crypted = '" . $this->db->escape($pass) . "'"; // case sensitive
 		$sql .= " AND sa.site = 'dolibarr_portal'";
 		$sql .= " AND sa.status = 1";
-		$sql .= " AND sa.entity IN (" . getEntity('societe') . ")";
+		$sql .= " AND sa.entity IN (".getEntity('societe').")";
 
-		dol_syslog(__METHOD__ . ' Try to find the third-party account id for login"' . $login . '" and site="dolibarr_portal"', LOG_DEBUG);
+		dol_syslog(__METHOD__.' Try to find the third-party account id for login"'.$login.'" and site="dolibarr_portal"', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result) == 1) {
@@ -689,13 +689,13 @@ 
 					if ($passok) {
 						$id = $obj->id;
 					} else {
-						dol_syslog(__METHOD__ .' Authentication KO bad password for ' . $login . ', cryptType=' . $cryptType, LOG_NOTICE);
+						dol_syslog(__METHOD__.' Authentication KO bad password for '.$login.', cryptType='.$cryptType, LOG_NOTICE);
 						sleep(1); // Brut force protection. Must be same delay when login is not valid
 						return -3;
 					}
 				}
 			} else {
-				dol_syslog(__METHOD__ . ' Many third-party account found for login"' . $login . '" and site="dolibarr_portal"', LOG_ERR);
+				dol_syslog(__METHOD__.' Many third-party account found for login"'.$login.'" and site="dolibarr_portal"', LOG_ERR);
 				return -2;
 			}
 		} else {

test/phpunit/UtilsTest.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -60,7 +60,7 @@ 
 			return;
 		}
 
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;

test/phpunit/FactureTest.php

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -69,7 +69,7 @@ 
 	 */
 	public function testFactureCreate()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -94,7 +94,7 @@ 
 	 */
 	public function testFactureFetch($id)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -119,7 +119,7 @@ 
 	 */
 	public function testFactureUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -144,7 +144,7 @@ 
 	 */
 	public function testFactureValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -169,15 +169,15 @@ 
 			$newlocalobject,
 			true,
 			array(
-				'newref','oldref','id','lines','client','thirdparty','brouillon','user_creation_id','date_creation','date_validation','datem','date_modification',
-				'ref','statut','status','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
+				'newref', 'oldref', 'id', 'lines', 'client', 'thirdparty', 'brouillon', 'user_creation_id', 'date_creation', 'date_validation', 'datem', 'date_modification',
+				'ref', 'statut', 'status', 'paye', 'specimen', 'ref', 'actiontypecode', 'actionmsg2', 'actionmsg', 'mode_reglement', 'cond_reglement',
 				'cond_reglement_doc', 'modelpdf',
-				'multicurrency_total_ht','multicurrency_total_tva',	'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
-				'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
-				'trackid','user_creat','user_valid'
+				'multicurrency_total_ht', 'multicurrency_total_tva', 'multicurrency_total_ttc', 'fk_multicurrency', 'multicurrency_code', 'multicurrency_tx',
+				'retained_warranty', 'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
+				'trackid', 'user_creat', 'user_valid'
 			)
 		);
-		$this->assertEquals($arraywithdiff, array());    // Actual, Expected
+		$this->assertEquals($arraywithdiff, array()); // Actual, Expected
 
 		return $localobject;
 	}
@@ -193,7 +193,7 @@ 
 	 */
 	public function testFactureOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -226,7 +226,7 @@ 
 	 */
 	public function testFactureDelete($id)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -249,21 +249,21 @@ 
 
 		$conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;
 
-		$result = $localobject2->delete($user);					// Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
+		$result = $localobject2->delete($user); // Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
 		print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
 		$this->assertEquals(0, $result, 'Deletion should fail, option INVOICE_CAN_NEVER_BE_REMOVED is on');
 
 		unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-		$result = $localobject->delete($user);					// Deletion is KO, it is not last invoice
+		$result = $localobject->delete($user); // Deletion is KO, it is not last invoice
 		print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
 		$this->assertEquals(0, $result, 'Deletion should fail, it is not last invoice');
 
-		$result = $localobject2->delete($user);					// Deletion is OK, it is last invoice
+		$result = $localobject2->delete($user); // Deletion is OK, it is last invoice
 		print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Deletion should work, it is last invoice');
 
-		$result = $localobject->delete($user);					// Deletion is KO, it is not last invoice
+		$result = $localobject->delete($user); // Deletion is KO, it is not last invoice
 		print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Deletion should work, it is again last invoice');
 
@@ -305,7 +305,7 @@ 
 				if (in_array($sKey, $fieldstoignorearray)) {
 					continue;
 				}
-				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+				if (!$ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
 					$retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {

test/phpunit/CMailFileTest.php

Spacing +24 added lines, -24 removed lines

@@ -27,9 +27,9 @@ 
 global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
-require_once dirname(__FILE__) . '/../../htdocs/master.inc.php';
-require_once dirname(__FILE__) . '/../../htdocs/core/class/CMailFile.class.php';
-require_once dirname(__FILE__) . '/../../htdocs/core/lib/files.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
@@ -65,8 +65,8 @@ 
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
 
 		$result = $localobject->sendfile();
-		print __METHOD__ . " result=" . $result . "\n";
-		$this->assertFalse($result);   // False because mail send disabled
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result); // False because mail send disabled
 
 		return $result;
 	}
@@ -88,42 +88,42 @@ 
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 0);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 1);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '<john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 2);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'john@doe.com');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 3, 0);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"John Doe" <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 3, 1);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 4);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe');
 
 		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
 		$result = $localobject->getValidAddress($src, 4);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
 
 		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
 		$result = $localobject->getValidAddress($src, 4, 0, 2);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe,John Doe2...');
 
 		return $result;
@@ -146,44 +146,44 @@ 
 		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
 		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
 
-		dol_delete_dir_recursive(DOL_DATA_ROOT . '/medias/image');
-		dol_mkdir(DOL_DATA_ROOT . '/medias/image');
-		dol_copy(dirname(__FILE__) . '/img250x20.png', DOL_DATA_ROOT . '/medias/image/img250x20.png');
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/image');
+		dol_mkdir(DOL_DATA_ROOT.'/medias/image');
+		dol_copy(dirname(__FILE__).'/img250x20.png', DOL_DATA_ROOT.'/medias/image/img250x20.png');
 
 		$msg = '<html><body>';
 		$msg .= '<img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/img250x20.png" style="height:39px; width:150px" />';
 		$msg .= ' <p>From wikipedia</p> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot" />';
 		$msg .= '</body></html>';
 
-		$tmp_dir =  $conf->admin->dir_temp.'/'.__FUNCTION__.getmypid().'_tmp';
+		$tmp_dir = $conf->admin->dir_temp.'/'.__FUNCTION__.getmypid().'_tmp';
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', $tmp_dir);
 
 		$result = count($localobject->html_images);
-		print __METHOD__ . " result count image detected in the mail=" . $result . "\n";
+		print __METHOD__." result count image detected in the mail=".$result."\n";
 		$this->assertEquals($result, 2);
 
 
 		foreach ($localobject->html_images as $i => $val) {
 			if ($localobject->html_images[$i]) {
 				if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
-					print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+					print __METHOD__." content type must be image png =".$localobject->html_images[$i]['content_type']."\n";
 					$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
-					print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";
+					print __METHOD__." type must be cidfromurl =".$localobject->html_images[$i]['type']."\n";
 					$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromurl');
 
 					$fileSize = 9744;
-					print __METHOD__ . " File size must be =" . $fileSize . "\n";
+					print __METHOD__." File size must be =".$fileSize."\n";
 					$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
 				} elseif (preg_match('/\.png/i', $localobject->html_images[$i]['fullpath'])) {
-					print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+					print __METHOD__." content type must be image png =".$localobject->html_images[$i]['content_type']."\n";
 					$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
-					print __METHOD__ . " type must be cidfromdata =" . $localobject->html_images[$i]['type'] . "\n";
+					print __METHOD__." type must be cidfromdata =".$localobject->html_images[$i]['type']."\n";
 					$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromdata');
 
 					$fileSize = 85;
-					print __METHOD__ . " File size must be =" . $fileSize . "\n";
+					print __METHOD__." File size must be =".$fileSize."\n";
 					$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
 				}
 			}