Dolibarr / dolibarr

htdocs/core/lib/date.lib.php

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

@@ -682,7 +682,7 @@
 {
 	$base = new DateTime("$year-03-21", new DateTimeZone("UTC"));
 	$days = easter_days($year); // Return number of days between 21 march and easter day.
-	$tmp = $base->add(new DateInterval("P{$days}D"));
+	$tmp = $base->add(new DateInterval("p{$days}d"));
 	return $tmp->getTimestamp();
 }
 

Spacing +5 added lines, -5 removed lines

@@ -295,11 +295,11 @@ 
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
 		} elseif ($format == 'allhourminsec') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
 		} elseif ($format == 'allhourmin') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
 		} elseif ($format == 'allhour') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600)));
 		}
 	} elseif ($format == 'hour') {	// only hour part
 		$sTime = dol_print_date($iSecond, '%H', true);
@@ -803,7 +803,7 @@ 
 		$sql = "SELECT code, entity, fk_country, dayrule, year, month, day, active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
 		$sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
-		$sql .= " AND entity IN (0," .getEntity('holiday') .")";
+		$sql .= " AND entity IN (0,".getEntity('holiday').")";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -947,7 +947,7 @@ 
 				$jour_1sunsept = date("d", $date_1sunsept);
 				$mois_1sunsept = date("m", $date_1sunsept);
 				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) {
-					$ferie=true;
+					$ferie = true;
 				}
 				// Geneva fast in Switzerland
 			}

htdocs/core/modules/modHRM.class.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 
 		// Array to add new pages in new tabs
 		$this->tabs = array();
-		$this->tabs[] = array('data'=>'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user');  					// To add a new tab identified by code tabname1
+		$this->tabs[] = array('data'=>'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1
 		//$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__');  					// To add a new tab identified by code tabname1
 		// Example:
 		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1

htdocs/core/extrafieldsinexport.inc.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 			case 'sellist':
 				$tmp = '';
 				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
+				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) {
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
 				}

htdocs/document.php

Spacing +2 added lines, -2 removed lines

@@ -138,7 +138,7 @@ 
  */
 
 // If we have a hash public (hashp), we guess the original_file.
-$ecmfile='';
+$ecmfile = '';
 if (!empty($hashp)) {
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 	$ecmfile = new EcmFiles($db);
@@ -196,7 +196,7 @@ 
 }
 
 // Security: Delete string ../ or ..\ into $original_file
-$original_file = preg_replace('/\.\.+/', '..', $original_file);	// Replace '... or more' with '..'
+$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
 $original_file = str_replace('../', '/', $original_file);
 $original_file = str_replace('..\\', '/', $original_file);
 

htdocs/core/class/html.formldap.class.php

Spacing +2 added lines, -2 removed lines

@@ -124,8 +124,8 @@
 			$htmlname = 'activesynchro';
 		}
 
-		$dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP") . (($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : "");
-		$ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr") . (($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : "");
+		$dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP").(($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : "");
+		$ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr").(($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : "");
 
 		$arraylist = array(
 			Ldap::SYNCHRO_NONE				=> $langs->trans("No"),

htdocs/product/inventory/ajax/searchfrombarcode.php

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
 	$result = $db->query($sql);
 	if ($result) {
 		$nbline = $db->num_rows($result);
-		for ($i=0; $i < $nbline; $i++) {
+		for ($i = 0; $i < $nbline; $i++) {
 			$object = $db->fetch_object($result);
 			if (($mode == "barcode" && $barcode == $object->barcode) || ($mode == "lotserial" && $barcode == $object->batch)) {
 				$warehouse->fetch(0, $product["Warehouse"]);
@@ -88,22 +88,22 @@ 
 					$fk_product = $object->fk_product;
 					$reelqty = $object->reel;
 
-					$objectreturn = array('fk_warehouse'=>$warehouseid,'fk_product'=>$fk_product,'reelqty'=>$reelqty);
+					$objectreturn = array('fk_warehouse'=>$warehouseid, 'fk_product'=>$fk_product, 'reelqty'=>$reelqty);
 				}
 			}
 		}
 		if ($warehousefound < 1) {
-			$response = array('status'=>'error','errorcode'=>'NotFound','message'=>'No warehouse found for barcode'.$barcode);
+			$response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>'No warehouse found for barcode'.$barcode);
 		} elseif ($warehousefound > 1) {
-			$response = array('status'=>'error','errorcode'=>'TooManyWarehouse','message'=>'Too many warehouse found');
+			$response = array('status'=>'error', 'errorcode'=>'TooManyWarehouse', 'message'=>'Too many warehouse found');
 		} else {
-			$response = array('status'=>'success','message'=>'Warehouse found','object'=>$objectreturn);
+			$response = array('status'=>'success', 'message'=>'Warehouse found', 'object'=>$objectreturn);
 		}
 	} else {
-		$response = array('status'=>'error','errorcode'=>'NotFound','message'=>"No results found for barcode");
+		$response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>"No results found for barcode");
 	}
 } else {
-	$response = array('status'=>'error','errorcode'=>'ActionError','message'=>"Error on action");
+	$response = array('status'=>'error', 'errorcode'=>'ActionError', 'message'=>"Error on action");
 }
 
 if ($action == "addnewlineproduct") {
@@ -122,12 +122,12 @@ 
 
 		$result = $inventoryline->create($user);
 		if ($result > 0) {
-			$response = array('status'=>'success','message'=>'Success on creating line','id_line'=>$result);
+			$response = array('status'=>'success', 'message'=>'Success on creating line', 'id_line'=>$result);
 		} else {
-			$response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation");
+			$response = array('status'=>'error', 'errorcode'=>'ErrorCreation', 'message'=>"Error on line creation");
 		}
 	} else {
-		$response = array('status'=>'error','errorcode'=>'NoIdForInventory','message'=>"No id for inventory");
+		$response = array('status'=>'error', 'errorcode'=>'NoIdForInventory', 'message'=>"No id for inventory");
 	}
 }
 

htdocs/core/multicompany_page.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 $title = $langs->trans("Multicompanies");
 
 // URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Multicompany selection -->'."\n";	// This is used by DoliDroid to know page is a multicompany selection page
+$head = '<!-- Multicompany selection -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

htdocs/core/bookmarks_page.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 $title = $langs->trans("Bookmarks");
 
 // URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Bookmarks -->'."\n";	// This is used by DoliDroid to know page is a bookmark selection page
+$head = '<!-- Bookmarks -->'."\n"; // This is used by DoliDroid to know page is a bookmark selection page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

htdocs/core/get_menudiv.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 $title = $langs->trans("Menu");
 
 // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Menu -->'."\n";	// This is used by DoliDroid to know page is a menu page
+$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);