Selaa lähdekoodia

do not ignore lines with mix od tabs and spaces

Frédéric FRANCE 5 vuotta sitten
vanhempi
commit
86f22c4563

+ 1 - 1
dev/initdata/generate-invoice.php

@@ -152,7 +152,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
     $fuser = new User($db);
     $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
-    
+
 	$result=$object->create($fuser);
 	if ($result >= 0)
 	{

+ 2 - 2
dev/initdata/generate-proposal.php

@@ -176,7 +176,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
     $fuser = new User($db);
     $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
-    
+
 	$object->contactid = $contids[$socids[$socid]][0];
 	$object->socid = $socids[$socid];
 	$object->datep = $dates[mt_rand(1, count($dates)-1)];
@@ -200,7 +200,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 			}
 			$xnbp++;
 		}
-		
+
 		$result=$object->valid($fuser);
 		if ($result > 0)
 		{

+ 3 - 3
htdocs/bom/bom_list.php

@@ -454,12 +454,12 @@ while ($i < min($num, $limit))
     	$cssforfield=(empty($val['css'])?'':$val['css']);
     	if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
     	elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-    	
+
     	if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
     	elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
-    	
+
     	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield.=($cssforfield?' ':'').'right';
-    	
+
         if (! empty($arrayfields['t.'.$key]['checked']))
         {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';

+ 1 - 1
htdocs/bom/class/api_boms.class.php

@@ -100,7 +100,7 @@ class Boms extends DolibarrApi
 
         $obj_ret = array();
         $tmpobject = new BOM($db);
-        
+
         $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
         $restrictonsocid = 0;	// Set to 1 if there is a field socid in table of object

+ 1 - 1
htdocs/comm/action/class/actioncomm.class.php

@@ -1543,7 +1543,7 @@ class ActionComm extends CommonObject
                     $event['uid']='dolibarragenda-'.$this->db->database_name.'-'.$obj->id."@".$_SERVER["SERVER_NAME"];
                     $event['type']=$type;
                     $datestart=$this->db->jdate($obj->datep)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
-					
+
                     // fix for -> Warning: A non-numeric value encountered
                     if(is_numeric($this->db->jdate($obj->datep2)))
                     {

+ 4 - 4
htdocs/comm/mailing/info.php

@@ -58,11 +58,11 @@ if ($object->fetch($id) >= 0)
 
 	$morehtmlright='';
 	if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
-	
+
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
-	
+
 	print '<div class="underbanner clearboth"></div><br>';
-	
+
 	//print '<table width="100%"><tr><td>';
 	$object->user_creation=$object->user_creat;
 	$object->date_creation=$object->date_creat;
@@ -70,7 +70,7 @@ if ($object->fetch($id) >= 0)
 	$object->date_validation=$object->date_valid;
 	dol_print_object_info($object, 0);
 	//print '</td></tr></table>';
-	
+
 
 	dol_fiche_end();
 }

+ 3 - 3
htdocs/compta/deplacement/info.php

@@ -47,15 +47,15 @@ if ($id)
 	$object = new Deplacement($db);
 	$object->fetch($id);
 	$object->info($id);
-	
+
 	$head = trip_prepare_head($object);
-	
+
 	dol_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip');
 
     print '<table width="100%"><tr><td>';
     dol_print_object_info($object);
     print '</td></tr></table>';
-      
+
     print '</div>';
 }
 

+ 1 - 1
htdocs/compta/paiement/class/cpaiement.class.php

@@ -34,7 +34,7 @@ class Cpaiement
 	 * @var string Id to identify managed objects
 	 */
 	public $element = 'cpaiement';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */

+ 1 - 1
htdocs/core/class/html.form.class.php

@@ -5614,7 +5614,7 @@ class Form
                     };
                     var d = new Date();";
             }
-            
+
 			// Generate the date part, depending on the use or not of the javascript calendar
             if($addnowlink==1) // server time expressed in user time setup
             {

+ 1 - 1
htdocs/core/class/lessc.class.php

@@ -3900,4 +3900,4 @@ class lessc_formatter_lessjs extends lessc_formatter_classic {
 	public $breakSelectors = true;
 	public $assignSeparator = ": ";
 	public $selectorSeparator = ",";
-}
+}

+ 2 - 2
htdocs/core/class/smtps.class.php

@@ -496,10 +496,10 @@ class SMTPs
                     return $_retVal;
                 }
             }
-			
+
 			// Default authentication method is LOGIN
 			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) $conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';
-			
+
             // Send Authentication to Server
             // Check for errors along the way
             switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {

+ 1 - 1
htdocs/core/class/translate.class.php

@@ -781,7 +781,7 @@ class Translate
 			if (preg_match('/^[a-z]+_[A-Z]+/i', $dir))
 			{
 				$this->load("languages");
-				
+
 				if (! empty($conf->global->MAIN_LANGUAGES_ALLOWED) && ! in_array($dir, explode(',', $conf->global->MAIN_LANGUAGES_ALLOWED)) ) continue;
 
 				if ($usecode == 2)

+ 2 - 2
htdocs/core/lib/invoice.lib.php

@@ -136,14 +136,14 @@ function invoice_admin_prepare_head()
 	$head[$h][1] = $langs->trans("Payments");
 	$head[$h][2] = 'payment';
 	$h++;
-	
+
 	if($conf->global->INVOICE_USE_SITUATION){
 	   $head[$h][0] = DOL_URL_ROOT.'/admin/facture_situation.php';
 	   $head[$h][1] = $langs->trans("InvoiceSituation");
 	   $head[$h][2] = 'situation';
 	   $h++;
 	}
-	
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab

+ 1 - 1
htdocs/core/lib/loan.lib.php

@@ -40,7 +40,7 @@ function loan_prepare_head($object)
 	$head[$tab][1] = $langs->trans('Card');
 	$head[$tab][2] = 'card';
 	$tab++;
-	
+
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/schedule.php?loanid='.$object->id;
 	$head[$tab][1] = $langs->trans('FinancialCommitment');
 	$head[$tab][2] = 'FinancialCommitment';

+ 1 - 1
htdocs/core/lib/member.lib.php

@@ -127,7 +127,7 @@ function member_type_prepare_head(AdherentType $object)
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
-	
+
 	// Multilangs
 	if (! empty($conf->global->MAIN_MULTILANGS))
 	{

+ 4 - 4
htdocs/core/lib/memory.lib.php

@@ -55,7 +55,7 @@ function dol_setcache($memoryid, $data)
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
        		if (! $result) return -1;
        	}
-       	
+
 	    $memoryid=session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$dolmemcache->add($memoryid, $data);    // This fails if key already exists
@@ -79,7 +79,7 @@ function dol_setcache($memoryid, $data)
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
        		if (! $result) return -1;
        	}
-	    
+
        	$memoryid=session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$result=$dolmemcache->add($memoryid, $data);    // This fails if key already exists
@@ -122,7 +122,7 @@ function dol_getcache($memoryid)
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
        		if (! $result) return -1;
        	}
-	    
+
 		$memoryid=session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		//print "Get memoryid=".$memoryid;
@@ -149,7 +149,7 @@ function dol_getcache($memoryid)
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
        		if (! $result) return -1;
        	}
-	    
+
        	$memoryid=session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		$data=$m->get($memoryid);

+ 3 - 3
htdocs/core/menus/standard/auguria_menu.php

@@ -113,7 +113,7 @@ class MenuManager
     	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
     	$this->tabMenu=$tabMenu;
     	//var_dump($tabMenu);
-    	
+
     	//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
    	}
 
@@ -152,7 +152,7 @@ class MenuManager
         	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         }
-        
+
 		if ($mode == 'topnb')
 		{
 		    print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
@@ -327,7 +327,7 @@ class MenuManager
         }
 
         unset($this->menu);
-        
+
         //print 'xx'.$mode;
         return 0;
     }

+ 1 - 1
htdocs/core/menus/standard/eldy_menu.php

@@ -65,7 +65,7 @@ class MenuManager
     public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
     {
     	global $conf, $user, $langs;
-    	
+
 		// On sauve en session le menu principal choisi
 		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
 		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];

+ 1 - 1
htdocs/core/modules/modProduct.class.php

@@ -85,7 +85,7 @@ class modProduct extends DolibarrModules
 		$this->const[$r][3] = 'Module to control product codes';
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		$this->const[$r][0] = "PRODUCT_PRICE_UNIQ";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "1";

+ 1 - 1
htdocs/core/modules/propale/doc/pdf_cyan.modules.php

@@ -198,7 +198,7 @@ class pdf_cyan extends ModelePDFPropales
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
 

+ 1 - 1
htdocs/core/tpl/extrafields_list_print_fields.tpl.php

@@ -50,7 +50,7 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 					$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1);
 					//var_dump($value);
 				}
-				
+
 				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
 				print '</td>';
 				if (! $i) $totalarray['nbfield']++;

+ 6 - 6
htdocs/hrm/admin/admin_hrm.php

@@ -42,15 +42,15 @@ $list = array (
  */
 if ($action == 'update') {
 	$error = 0;
-	
+
 	foreach ($list as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
-		
+
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-	
+
 	if (! $error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -87,13 +87,13 @@ print "</tr>\n";
 
 foreach ($list as $key) {
 	$var = ! $var;
-	
+
 	print '<tr ' . $bc[$var] . ' class="value">';
-	
+
 	// Param
 	$label = $langs->trans($key);
 	print '<td width="50%"><label for="' . $key . '">' . $label . '</label></td>';
-	
+
 	// Value
 	print '<td>';
 	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';

+ 2 - 2
htdocs/product/class/product.class.php

@@ -940,11 +940,11 @@ class Product extends CommonObject
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."product";
             $sql.= " SET label = '" . $this->db->escape($this->label) ."'";
-            
+
             if ($updatetype && ($this->isProduct() || $this->isService())) {
                 $sql.= ", fk_product_type = " . $this->type;
             }
-            
+
             $sql.= ", ref = '" . $this->db->escape($this->ref) ."'";
             $sql.= ", ref_ext = ".(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null");
             $sql.= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");

+ 3 - 3
htdocs/product/inventory/list.php

@@ -440,12 +440,12 @@ while ($i < min($num, $limit))
 		$cssforfield=(empty($val['css'])?'':$val['css']);
 		if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
 		elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-		
+
 		if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
 		elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
-		
+
 		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield.=($cssforfield?' ':'').'right';
-		
+
 		if (! empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';

+ 1 - 1
htdocs/product/stats/facture.php

@@ -234,7 +234,7 @@ if ($id > 0 || ! empty($ref))
                     while ($i < min($num, $limit))
 					{
                         $objp = $db->fetch_object($result);
-                        
+
 						if ($objp->type == Facture::TYPE_CREDIT_NOTE) $objp->qty=-($objp->qty);
 
 						$total_ht+=$objp->total_ht;

+ 3 - 3
htdocs/societe/class/api_thirdparties.class.php

@@ -72,10 +72,10 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @throws 	RestException
 	 */
-  public function get($id)
+    public function get($id)
 	{
-    return $this->_fetch($id);
-  }
+        return $this->_fetch($id);
+    }
 
 	/**
 	 * Get properties of a thirdparty object by email.

+ 2 - 2
htdocs/takepos/admin/receipt.php

@@ -41,12 +41,12 @@ $langs->loadLangs(array("admin", "cashdesk", "commercial"));
 if (GETPOST('action', 'alpha') == 'set')
 {
 	$db->begin();
-	
+
 	$res = dolibarr_set_const($db, "TAKEPOS_HEADER", GETPOST('TAKEPOS_HEADER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_RECEIPT_NAME", GETPOST('TAKEPOS_RECEIPT_NAME', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SHOW_CUSTOMER", GETPOST('TAKEPOS_SHOW_CUSTOMER', 'alpha'), 'chaine', 0, '', $conf->entity);
-	
+
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
 	if (! $res > 0) $error++;

+ 1 - 1
test/phpunit/BOMTest.php

@@ -79,7 +79,7 @@ class BOMTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
-		
+
 		print __METHOD__."\n";
 	}