Dolibarr / dolibarr

htdocs/adherents/type_translation.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
 	// update of object
 	if ($forcelangprod == $current_lang) {
-		$object->label		 = GETPOST("libelle", 'alphanohtml');
+		$object->label = GETPOST("libelle", 'alphanohtml');
 		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
 		//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	} else {

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 +10 added lines, -10 removed lines

@@ -186,7 +186,7 @@ 
 
 		$newtimeyear = (int) dol_print_date($newtime, '%Y');
 		$newtimemonth = (int) dol_print_date($newtime, '%m');
-		$newtimetotalmonths = (($newtimeyear * 12) +  $newtimemonth);
+		$newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
 
 		if ($monthsexpected < $newtimetotalmonths) {
 			$newtimehours = (int) dol_print_date($newtime, '%H');
@@ -801,7 +801,7 @@ 
 		$sql = "SELECT id, 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) {
@@ -832,7 +832,7 @@ 
 		$jour  = (int) gmdate("d", $timestampStart);
 		$mois  = (int) gmdate("m", $timestampStart);
 		$annee = (int) gmdate("Y", $timestampStart);
-		$jour_semaine = (int) gmdate("w", $timestampStart);		// sunday = 0, monday = 1, ...
+		$jour_semaine = (int) gmdate("w", $timestampStart); // sunday = 0, monday = 1, ...
 
 		//print "jour=".$jour." month=".$mois." year=".$annee." includesaturday=".$includesaturday." includesunday=".$includesunday."\n";
 		foreach ($arrayOfPublicHolidays as $entrypublicholiday) {
@@ -1053,13 +1053,13 @@ 
 
 	$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
 
-	if (empty($conf->cache['arrayOfActivePublicHolidays_' . $country_id])) {
+	if (empty($conf->cache['arrayOfActivePublicHolidays_'.$country_id])) {
 		// Loop on public holiday defined into hrm_public_holiday for the day, month and year analyzed
 		$tmpArrayOfPublicHolidays = array();
 		$sql = "SELECT id, 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 .= " 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').")";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -1072,14 +1072,14 @@ 
 			}
 		} else {
 			dol_syslog($db->lasterror(), LOG_ERR);
-			return 'Error sql ' . $db->lasterror();
+			return 'Error sql '.$db->lasterror();
 		}
 
 		//var_dump($tmpArrayOfPublicHolidays);
-		$conf->cache['arrayOfActivePublicHolidays_' . $country_id] = $tmpArrayOfPublicHolidays;
+		$conf->cache['arrayOfActivePublicHolidays_'.$country_id] = $tmpArrayOfPublicHolidays;
 	}
 
-	$arrayOfPublicHolidays = $conf->cache['arrayOfActivePublicHolidays_' . $country_id];
+	$arrayOfPublicHolidays = $conf->cache['arrayOfActivePublicHolidays_'.$country_id];
 	$listFeries = [];
 	$i = 0;
 	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))

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/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/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);

htdocs/holiday/month_report.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
 $sql .= " AND (";
 $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
-$sql .= " OR";	// For leave over several months
+$sql .= " OR"; // For leave over several months
 $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') ";
 $sql .= " )";
 if (!empty($search_ref)) {

htdocs/core/modules/takepos/mod_takepos_ref_simple.php

Spacing +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function getExample()
 	{
-		return $this->prefix.'0-0501-0001';		// TC0-0501-0001
+		return $this->prefix.'0-0501-0001'; // TC0-0501-0001
 	}
 
 	/**
@@ -92,10 +92,10 @@ 
 		$pryymm = '';
 		$max = '';
 
-		$pos_source = 0;	// POS source = Terminal ID
+		$pos_source = 0; // POS source = Terminal ID
 
 		// First, we get the max value
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
 
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
@@ -135,10 +135,10 @@ 
 	{
 		global $db;
 
-		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;	// POS source = Terminal ID
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID
 
 		// First, we get the max value
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'";

htdocs/core/lib/contact.lib.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 			} else {
 				dol_print_error($db);
 			}
-			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id;
 		$head[$tab][1] = $langs->trans("Projects");