Dolibarr / dolibarr

htdocs/core/actions_dellink.inc.php

Indentation +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
 // Link invoice to order
 if ($action == 'addlink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $id > 0 && $addlinkid > 0)
 {
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-    $result = $object->add_object_linked(GETPOST('addlink','alpha'), $addlinkid);
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$result = $object->add_object_linked(GETPOST('addlink','alpha'), $addlinkid);
 }
 
 // Delete link

Spacing +7 added lines, -7 removed lines

@@ -26,21 +26,21 @@
 // $object must be defined
 // $permissiondellink must be defined
 
-$dellinkid = GETPOST('dellinkid','int');
-$addlinkid = GETPOST('idtolinkto','int');
+$dellinkid = GETPOST('dellinkid', 'int');
+$addlinkid = GETPOST('idtolinkto', 'int');
 
 // Link invoice to order
-if ($action == 'addlink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $id > 0 && $addlinkid > 0)
+if ($action == 'addlink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0)
 {
     $object->fetch($id);
     $object->fetch_thirdparty();
-    $result = $object->add_object_linked(GETPOST('addlink','alpha'), $addlinkid);
+    $result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
 }
 
 // Delete link
-if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $dellinkid > 0)
+if ($action == 'dellink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $dellinkid > 0)
 {
-	$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
-	if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+	$result = $object->deleteObjectLinked(0, '', 0, '', $dellinkid);
+	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 

Braces +4 added lines, -2 removed lines

@@ -41,6 +41,8 @@
 if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel','alpha') && $dellinkid > 0)
 {
 	$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
-	if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
-}
+	if ($result < 0) {
+		setEventMessages($object->error,$object->errors,'errors');
+	}
+	}
 

htdocs/core/datepicker.php

Indentation +2 added lines, -2 removed lines

@@ -240,8 +240,8 @@
 
 		if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
 		{
-		    print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
-		    exit;
+			print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
+			exit;
 		}
 
 		// Sur click dans calendrier, appelle fonction dpClickDay

Spacing +65 added lines, -65 removed lines

@@ -26,26 +26,26 @@ 
  *       \brief      File to manage popup date selector
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// disabled
+if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1'); // disabled
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);					// disabled
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1); // disabled
+if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
 
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 $langs->load("agenda");
 
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 //var_dump($langs->defaultlang);
 //var_dump($conf->format_date_short_java);
@@ -66,7 +66,7 @@ 
 }
 
 // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8)
-$tradTemp=array($langs->trans("January"),
+$tradTemp = array($langs->trans("January"),
 $langs->trans("February"),
 $langs->trans("March"),
 $langs->trans("April"),
@@ -81,7 +81,7 @@ 
 );
 print '<script type="text/javascript">';
 print 'var tradMonths = [';
-foreach($tradTemp as $val)
+foreach ($tradTemp as $val)
 {
 	print '"'.addslashes($val).'",';
 }
@@ -92,29 +92,29 @@ 
 print '<body>'."\n";
 
 
-$qualified=true;
+$qualified = true;
 
-if (! isset($_GET["sd"])) $_GET["sd"]="00000000";
+if (!isset($_GET["sd"])) $_GET["sd"] = "00000000";
 
-if (! isset($_GET["m"])) $qualified=false;
-if (! isset($_GET["y"])) $qualified=false;
+if (!isset($_GET["m"])) $qualified = false;
+if (!isset($_GET["y"])) $qualified = false;
 if (isset($_GET["m"]) && isset($_GET["y"]))
 {
-	if ($_GET["m"] < 1)    $qualified=false;
-	if ($_GET["m"] > 12)   $qualified=false;
-	if ($_GET["y"] < 0)    $qualified=false;
-	if ($_GET["y"] > 9999) $qualified=false;
+	if ($_GET["m"] < 1)    $qualified = false;
+	if ($_GET["m"] > 12)   $qualified = false;
+	if ($_GET["y"] < 0)    $qualified = false;
+	if ($_GET["y"] > 9999) $qualified = false;
 }
 
 // If parameters provided, we show calendar
 if ($qualified)
 {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
-	displayBox(GETPOST("sd",'alpha'),GETPOST("m",'int'),GETPOST("y",'int'));
+	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
 }
 else
 {
-	dol_print_error('','ErrorBadParameters');
+	dol_print_error('', 'ErrorBadParameters');
 }
 
 
@@ -128,10 +128,10 @@ 
  */
 function xyzToUnixTimestamp($mysqldate)
 {
-	$year=substr($mysqldate,0,4);
-	$month=substr($mysqldate,4,2);
-	$day=substr($mysqldate,6,2);
-	$unixtimestamp=dol_mktime(12,0,0,$month,$day,$year);
+	$year = substr($mysqldate, 0, 4);
+	$month = substr($mysqldate, 4, 2);
+	$day = substr($mysqldate, 6, 2);
+	$unixtimestamp = dol_mktime(12, 0, 0, $month, $day, $year);
 	return $unixtimestamp;
 }
 
@@ -143,24 +143,24 @@ 
  * @param 	int		$year			Year
  * @return	void
  */
-function displayBox($selectedDate,$month,$year)
+function displayBox($selectedDate, $month, $year)
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	//print "$selectedDate,$month,$year";
-	$thedate=dol_mktime(12,0,0,$month,1,$year);
+	$thedate = dol_mktime(12, 0, 0, $month, 1, $year);
 	//print "thedate=$thedate";
-	$today=dol_now();
-	$todayArray=dol_getdate($today);
-	if($selectedDate != "00000000")
+	$today = dol_now();
+	$todayArray = dol_getdate($today);
+	if ($selectedDate != "00000000")
 	{
-		$selDate=xyzToUnixTimestamp($selectedDate);
-		$xyz=dol_print_date($selDate,"%Y%m%d");
+		$selDate = xyzToUnixTimestamp($selectedDate);
+		$xyz = dol_print_date($selDate, "%Y%m%d");
 	}
 	else
 	{
-		$selDate=0;
-		$xyz=0;
+		$selDate = 0;
+		$xyz = 0;
 	}
 	?>
 <table class="dp">
@@ -177,42 +177,42 @@ 
 	</tr>
 	<tr>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year-1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;&lt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year - 1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;&lt;</td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==1) echo "12"; else echo $month-1?>','<?php if($month==1) echo $year-1; else echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 1) echo "12"; else echo $month - 1?>','<?php if ($month == 1) echo $year - 1; else echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
 		<td colspan="3" class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo (int) dol_print_date($today,'%m')?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><?php echo '-' ?></td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo (int) dol_print_date($today, '%m')?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><?php echo '-' ?></td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==12) echo "1"; else echo $month+1?>','<?php if($month==12) echo $year+1; else echo $year;?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 12) echo "1"; else echo $month + 1?>','<?php if ($month == 12) echo $year + 1; else echo $year; ?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year + 1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
 	<tr class="dpDayNames">
 	<?php
-	$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+	$startday = isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1;
 	$day_names = array('ShortSunday', 'ShortMonday', 'ShortTuesday', 'ShortWednesday', 'ShortThursday', 'ShortFriday', 'ShortSaturday');
-	for( $i=0; $i < 7; $i++ )
+	for ($i = 0; $i < 7; $i++)
 	{
-		echo '<td width="', (int) (($i+1)*100/7) - (int) ($i*100/7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
+		echo '<td width="', (int) (($i + 1) * 100 / 7) - (int) ($i * 100 / 7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
 	}
 	?>
 	</tr>
 	<?php
 	//print "x ".$thedate." y";			// $thedate = first day of month
-	$firstdate=dol_getdate($thedate);
+	$firstdate = dol_getdate($thedate);
 	//var_dump($firstdateofweek);
-	$mydate=dol_get_first_day_week(1, $month, $year, true);	// mydate = cursor date
+	$mydate = dol_get_first_day_week(1, $month, $year, true); // mydate = cursor date
 
 	// Loop on each day of month
-	$stoploop=0; $day=1; $cols=0;
-	while (! $stoploop)
+	$stoploop = 0; $day = 1; $cols = 0;
+	while (!$stoploop)
 	{
 		//print_r($mydate);
 		if ($mydate < $firstdate)	// At first run
 		{
 			echo "<TR class=\"dpWeek\">";
 			//echo $conf->global->MAIN_START_WEEK.' '.$firstdate["wday"].' '.$startday;
-			$cols=0;
+			$cols = 0;
 			for ($i = 0; $i < 7; $i++)
 			{
 				$w = ($i + $startday) % 7;
@@ -230,15 +230,15 @@ 
 			if ($mydate["wday"] == $startday)
 			{
 				echo "<TR class=\"dpWeek\">";
-				$cols=0;
+				$cols = 0;
 			}
 		}
 
-		$dayclass="dpReg";
-		if($thedate==$selDate) $dayclass="dpSelected";
-		elseif($thedate==$today) $dayclass="dpToday";
+		$dayclass = "dpReg";
+		if ($thedate == $selDate) $dayclass = "dpSelected";
+		elseif ($thedate == $today) $dayclass = "dpToday";
 
-		if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
+		if ($langs->trans("FormatDateShortJavaInput") == "FormatDateShortJavaInput")
 		{
 		    print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
 		    exit;
@@ -246,40 +246,40 @@ 
 
 		// Sur click dans calendrier, appelle fonction dpClickDay
 		echo "<TD class=\"".$dayclass."\"";
-		echo " onMouseOver=\"dpHighlightDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",tradMonths)\"";
-		echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJavaInput")."')\"";
-		echo ">".sprintf("%02s",$mydate["mday"])."</TD>";
+		echo " onMouseOver=\"dpHighlightDay(".$mydate["year"].",parseInt('".dol_print_date($thedate, "%m")."',10),".$mydate["mday"].",tradMonths)\"";
+		echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate, "%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJavaInput")."')\"";
+		echo ">".sprintf("%02s", $mydate["mday"])."</TD>";
 		$cols++;
 
 		if (($mydate["wday"] + 1) % 7 == $startday) echo "</TR>\n";
 
 		//$thedate=strtotime("tomorrow",$thedate);
 		$day++;
-		$thedate=dol_mktime(12,0,0,$month,$day,$year);
+		$thedate = dol_mktime(12, 0, 0, $month, $day, $year);
 		if ($thedate == '')
 		{
-			$stoploop=1;
+			$stoploop = 1;
 		}
 		else
 		{
-			$mydate=dol_getdate($thedate);
-			if ($firstdate["month"] != $mydate["month"]) $stoploop=1;
+			$mydate = dol_getdate($thedate);
+			if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
 		}
 	}
 
 	if ($cols < 7)
 	{
-		for($i=6; $i>=$cols; $i--) echo "<TD>&nbsp;</TD>";
+		for ($i = 6; $i >= $cols; $i--) echo "<TD>&nbsp;</TD>";
 		echo "</TR>\n";
 	}
 	?>
 	<tr>
 		<td id="dpExp" class="dpExplanation" colspan="7"><?php
-		if($selDate)
+		if ($selDate)
 		{
-			$tempDate=dol_getdate($selDate);
+			$tempDate = dol_getdate($selDate);
 			print $langs->trans("Month".$selectMonth)." ";
-			print sprintf("%02s",$tempDate["mday"]);
+			print sprintf("%02s", $tempDate["mday"]);
 			print ", ".$selectYear;
 		}
 		else

Braces +88 added lines, -36 removed lines

@@ -26,20 +26,39 @@ 
  *       \brief      File to manage popup date selector
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// disabled
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER','1');
+}
+// disabled
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);					// disabled
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL',1);
+}
+if (! defined('NOLOGIN')) {
+	define('NOLOGIN',1);
+}
+// disabled
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML',1);
+}
 
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 $langs->load("agenda");
@@ -59,8 +78,7 @@ 
 if (GETPOST('mode') && GETPOST('mode') == 'test')
 {
 	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php"></script>'."\n";
-}
-else
+} else
 {
 	print '<title>'.$langs->trans("Calendar").'</title>';
 }
@@ -94,25 +112,38 @@ 
 
 $qualified=true;
 
-if (! isset($_GET["sd"])) $_GET["sd"]="00000000";
+if (! isset($_GET["sd"])) {
+	$_GET["sd"]="00000000";
+}
 
-if (! isset($_GET["m"])) $qualified=false;
-if (! isset($_GET["y"])) $qualified=false;
+if (! isset($_GET["m"])) {
+	$qualified=false;
+}
+if (! isset($_GET["y"])) {
+	$qualified=false;
+}
 if (isset($_GET["m"]) && isset($_GET["y"]))
 {
-	if ($_GET["m"] < 1)    $qualified=false;
-	if ($_GET["m"] > 12)   $qualified=false;
-	if ($_GET["y"] < 0)    $qualified=false;
-	if ($_GET["y"] > 9999) $qualified=false;
-}
+	if ($_GET["m"] < 1) {
+		$qualified=false;
+	}
+	if ($_GET["m"] > 12) {
+		$qualified=false;
+	}
+	if ($_GET["y"] < 0) {
+		$qualified=false;
+	}
+	if ($_GET["y"] > 9999) {
+		$qualified=false;
+	}
+	}
 
 // If parameters provided, we show calendar
 if ($qualified)
 {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
 	displayBox(GETPOST("sd",'alpha'),GETPOST("m",'int'),GETPOST("y",'int'));
-}
-else
+} else
 {
 	dol_print_error('','ErrorBadParameters');
 }
@@ -156,8 +187,7 @@ 
 	{
 		$selDate=xyzToUnixTimestamp($selectedDate);
 		$xyz=dol_print_date($selDate,"%Y%m%d");
-	}
-	else
+	} else
 	{
 		$selDate=0;
 		$xyz=0;
@@ -179,11 +209,25 @@ 
 		<td class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year-1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;&lt;</td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==1) echo "12"; else echo $month-1?>','<?php if($month==1) echo $year-1; else echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==1) {
+	echo "12";
+} else {
+	echo $month-1?>','<?php if($month==1) echo $year-1;
+}
+else {
+	echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
 		<td colspan="3" class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo (int) dol_print_date($today,'%m')?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><?php echo '-' ?></td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==12) echo "1"; else echo $month+1?>','<?php if($month==12) echo $year+1; else echo $year;?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==12) echo "1";
+}
+else {
+	echo $month+1?>','<?php if($month==12) echo $year+1;
+}
+else {
+	echo $year;
+}
+?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
 		<td class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
@@ -208,9 +252,11 @@ 
 	while (! $stoploop)
 	{
 		//print_r($mydate);
-		if ($mydate < $firstdate)	// At first run
+		if ($mydate < $firstdate) {
+			// At first run
 		{
 			echo "<TR class=\"dpWeek\">";
+		}
 			//echo $conf->global->MAIN_START_WEEK.' '.$firstdate["wday"].' '.$startday;
 			$cols=0;
 			for ($i = 0; $i < 7; $i++)
@@ -224,8 +270,7 @@ 
 				echo "<TD>&nbsp;</TD>";
 				$cols++;
 			}
-		}
-		else
+		} else
 		{
 			if ($mydate["wday"] == $startday)
 			{
@@ -235,8 +280,11 @@ 
 		}
 
 		$dayclass="dpReg";
-		if($thedate==$selDate) $dayclass="dpSelected";
-		elseif($thedate==$today) $dayclass="dpToday";
+		if($thedate==$selDate) {
+			$dayclass="dpSelected";
+		} elseif($thedate==$today) {
+			$dayclass="dpToday";
+		}
 
 		if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
 		{
@@ -251,7 +299,9 @@ 
 		echo ">".sprintf("%02s",$mydate["mday"])."</TD>";
 		$cols++;
 
-		if (($mydate["wday"] + 1) % 7 == $startday) echo "</TR>\n";
+		if (($mydate["wday"] + 1) % 7 == $startday) {
+			echo "</TR>\n";
+		}
 
 		//$thedate=strtotime("tomorrow",$thedate);
 		$day++;
@@ -259,17 +309,20 @@ 
 		if ($thedate == '')
 		{
 			$stoploop=1;
-		}
-		else
+		} else
 		{
 			$mydate=dol_getdate($thedate);
-			if ($firstdate["month"] != $mydate["month"]) $stoploop=1;
+			if ($firstdate["month"] != $mydate["month"]) {
+				$stoploop=1;
+			}
 		}
 	}
 
 	if ($cols < 7)
 	{
-		for($i=6; $i>=$cols; $i--) echo "<TD>&nbsp;</TD>";
+		for($i=6; $i>=$cols; $i--) {
+			echo "<TD>&nbsp;</TD>";
+		}
 		echo "</TR>\n";
 	}
 	?>
@@ -281,8 +334,7 @@ 
 			print $langs->trans("Month".$selectMonth)." ";
 			print sprintf("%02s",$tempDate["mday"]);
 			print ", ".$selectYear;
-		}
-		else
+		} else
 		{
 			print "Click a Date";
 		}

htdocs/core/search.php

Indentation +6 added lines, -6 removed lines

@@ -126,19 +126,19 @@
 }
 if (GETPOST('search_task') != '')
 {
-    header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
+	exit;
 }
 
 if (GETPOST('search_user') != '')
 {
-    header("Location: ".DOL_URL_ROOT.'/user/index.php?mode=search&sall='.urlencode(GETPOST('search_user')));
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/user/index.php?mode=search&sall='.urlencode(GETPOST('search_user')));
+	exit;
 }
 if (GETPOST('search_group') != '')
 {
-    header("Location: ".DOL_URL_ROOT.'/user/group/index.php?mode=search&sall='.urlencode(GETPOST('search_group')));
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/user/group/index.php?mode=search&sall='.urlencode(GETPOST('search_group')));
+	exit;
 }
 
 

Spacing +9 added lines, -9 removed lines

@@ -23,14 +23,14 @@ 
  *       \brief      Wrapper that receive any search. Depending on input field, make a redirect to correct URL.
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1'); // Not disabled cause need to load personalized language
+if (!defined('NOREQUIREDB'))   define('NOREQUIREDB', '1'); // Not disabled cause need to load personalized language
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1'); // Not disabled cause need to do translations
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1); // Not disabled cause need to load personalized language
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
@@ -144,7 +144,7 @@ 
 
     
 // If we are here, search was called with no supported criteria
-if (! empty($_SERVER['HTTP_REFERER']))
+if (!empty($_SERVER['HTTP_REFERER']))
 {
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;

Braces +29 added lines, -10 removed lines

@@ -23,14 +23,34 @@ 
  *       \brief      Wrapper that receive any search. Depending on input field, make a redirect to correct URL.
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER','1');
+}
+// Not disabled cause need to load personalized language
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB','1');
+}
+// Not disabled cause need to load personalized language
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
+// Not disabled cause need to do translations
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL',1);
+}
+if (! defined('NOLOGIN')) {
+	define('NOLOGIN',1);
+}
+// Not disabled cause need to load personalized language
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU',1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
@@ -148,8 +168,7 @@ 
 {
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;
-}
-else
+} else
 {
 	print 'The wrapper search.php was called without any search criteria';
 }

htdocs/core/antispamimage.php

Indentation +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 $string = '';
 for($i = 0; $i < $length; $i++)
 {
-    $string .= $letters{mt_rand(0, $number - 1)};
+	$string .= $letters{mt_rand(0, $number - 1)};
 }
 //print $string;
 
@@ -54,8 +54,8 @@ 
 $img = imagecreate(80,32);
 if (empty($img))
 {
-    dol_print_error('',"Problem with GD creation");
-    exit;
+	dol_print_error('',"Problem with GD creation");
+	exit;
 }
 
 // Define mime type

Spacing +13 added lines, -13 removed lines

@@ -21,14 +21,14 @@ 
  *		\brief      Return antispam image
  */
 
-define('NOLOGIN',1);
+define('NOLOGIN', 1);
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER',1);
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB',1);
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', 1);
+if (!defined('NOREQUIREDB'))     define('NOREQUIREDB', 1);
+if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', 1);
+if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 
 require_once '../main.inc.php';
 
@@ -37,24 +37,24 @@ 
  * View
  */
 
-$length=5;
+$length = 5;
 $letters = 'aAbBCDeEFgGhHJKLmMnNpPqQRsStTuVwWXYZz2345679';
 $number = strlen($letters);
 $string = '';
-for($i = 0; $i < $length; $i++)
+for ($i = 0; $i < $length; $i++)
 {
     $string .= $letters{mt_rand(0, $number - 1)};
 }
 //print $string;
 
 
-$sessionkey='dol_antispam_value';
-$_SESSION[$sessionkey]=$string;
+$sessionkey = 'dol_antispam_value';
+$_SESSION[$sessionkey] = $string;
 
-$img = imagecreate(80,32);
+$img = imagecreate(80, 32);
 if (empty($img))
 {
-    dol_print_error('',"Problem with GD creation");
+    dol_print_error('', "Problem with GD creation");
     exit;
 }
 

Braces +18 added lines, -6 removed lines

@@ -23,12 +23,24 @@
 
 define('NOLOGIN',1);
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER',1);
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB',1);
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER',1);
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB',1);
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN',1);
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL',1);
+}
 
 require_once '../main.inc.php';
 

htdocs/core/modules/security/generate/modGeneratePassStandard.class.php

Indentation +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 	/**
 	 *		Return description of module
 	 *
- 	 *      @return     string      Description of module
+	 *      @return     string      Description of module
 	 */
 	function getDescription()
 	{
@@ -73,7 +73,7 @@ 
 	/**
 	 * 		Return an example of password generated by this module
 	 *
- 	 *      @return     string      Example of password
+	 *      @return     string      Example of password
 	 */
 	function getExample()
 	{
@@ -83,7 +83,7 @@ 
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
 	function getNewGeneratedPassword()
 	{
@@ -120,7 +120,7 @@ 
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
 	function validatePassword($password)
 	{

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  *		\brief      File to manage password generation according to standard rule
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -53,10 +53,10 @@ 
 		$this->id = "standard";
 		$this->length = 8;
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 		{
 
 			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
+			$char = substr($possible, mt_rand(0, dol_strlen($possible) - 1), 1);
 
 			// we don't want this character if it's already in the password
 			if (!strstr($password, $char))

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,9 @@
 	 */
 	function validatePassword($password)
 	{
-		if (dol_strlen($password) < $this->length) return 0;
+		if (dol_strlen($password) < $this->length) {
+			return 0;
+		}
 		return 1;
 	}
 }

htdocs/core/modules/security/generate/modGeneratePassNone.class.php

Indentation +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 	/**
 	 *		Return description of module
 	 *
- 	 *      @return     string      Description of text
+	 *      @return     string      Description of text
 	 */
 	function getDescription()
 	{
@@ -73,7 +73,7 @@ 
 	/**
 	 * 		Return an example of password generated by this module
 	 *
- 	 *      @return     string      Example of password
+	 *      @return     string      Example of password
 	 */
 	function getExample()
 	{
@@ -83,7 +83,7 @@ 
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
 	function getNewGeneratedPassword()
 	{
@@ -94,7 +94,7 @@ 
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
 	function validatePassword($password)
 	{

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
  *      \brief      File to manage no password generation.
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -53,10 +53,10 @@ 
 		$this->id = "none";
 		$this->length = 0;
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 	}
 
 	/**

htdocs/core/modules/security/generate/modules_genpassword.php

Indentation +42 added lines, -42 removed lines

@@ -30,62 +30,62 @@
  */
 abstract class ModeleGenPassword
 {
-    var $error='';
+	var $error='';
 
-    /**
-     * 		Return if a module can be used or not
-     *
-     *      @return		boolean     true if module can be used
-     */
-    function isEnabled()
-    {
-        return true;
-    }
+	/**
+	 * 		Return if a module can be used or not
+	 *
+	 *      @return		boolean     true if module can be used
+	 */
+	function isEnabled()
+	{
+		return true;
+	}
 
-    /**
-     *		Return description of module
-     *
-     *      @return     string      Description of text
-     */
-    function getDescription()
-    {
-        global $langs;
-        return $langs->trans("NoDescription");
-    }
+	/**
+	 *		Return description of module
+	 *
+	 *      @return     string      Description of text
+	 */
+	function getDescription()
+	{
+		global $langs;
+		return $langs->trans("NoDescription");
+	}
 
-    /**
-     * 		Return an example of password generated by this module
-     *
-     *      @return     string      Example of password
-     */
-    function getExample()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
+	/**
+	 * 		Return an example of password generated by this module
+	 *
+	 *      @return     string      Example of password
+	 */
+	function getExample()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
 
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
-    function getNewGeneratedPassword()
-    {
-        global $langs;
-        return $langs->trans("NotAvailable");
-    }
+	function getNewGeneratedPassword()
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
 
 	/**
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
-    function validatePassword($password)
-    {
-        return 1;
-    }
+	function validatePassword($password)
+	{
+		return 1;
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
  */
 abstract class ModeleGenPassword
 {
-    var $error='';
+    var $error = '';
 
     /**
      * 		Return if a module can be used or not

htdocs/core/modules/security/generate/modGeneratePassPerso.class.php

Braces +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 			if($c != $last){
 				$last = $c;
 				$count = 0;
-			}else{
+			} else{
 				$count++;
 			}
 

Spacing +31 added lines, -31 removed lines

@@ -24,7 +24,7 @@ 
  *      \brief      File to manage no password generation.
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -67,23 +67,23 @@ 
 		$this->id = "Perso";
 		$this->length = $langs->trans("SetupPerso");
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 
-		if(empty($conf->global->USER_PASSWORD_PATTERN)){
+		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
 			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
 		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 		$this->Min = strtolower($this->Maj);
 		$this->Nb = "0123456789";
 		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
-		$this->Ambi = array("1","I","l","|","O","0");
+		$this->Ambi = array("1", "I", "l", "|", "O", "0");
 
-		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+		$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
 		$this->length2 = $tabConf[0];
 		$this->NbMaj = $tabConf[1];
 		$this->NbNum = $tabConf[2];
@@ -93,13 +93,13 @@ 
 
 		if ($this->WithoutAmbi)
 		{
-			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
-			$this->Min = str_replace($this->Ambi,"",$this->Min);
-			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
-			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
+			$this->Maj = str_replace($this->Ambi, "", $this->Maj);
+			$this->Min = str_replace($this->Ambi, "", $this->Min);
+			$this->Nb  = str_replace($this->Ambi, "", $this->Nb);
+			$this->Spe = str_replace($this->Ambi, "", $this->Spe);
 		}
 
-		$pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+		$pattern = $this->Min.(!empty($this->NbMaj) ? $this->Maj : '').(!empty($this->NbNum) ? $this->Nb : '').(!empty($this->NbSpe) ? $this->Spe : '');
 		$this->All = str_shuffle($pattern);
 
 		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
@@ -137,20 +137,20 @@ 
 	function getNewGeneratedPassword()
 	{
 		$pass = "";
-		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
+		for ($i = 0; $i < $this->NbMaj; $i++) { // Y
+			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
-		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
+		for ($i = 0; $i < $this->NbNum; $i++) { // X
+			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
-		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
+		for ($i = 0; $i < $this->NbSpe; $i++) { // @
+			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
-		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
+		for ($i = strlen($pass); $i < $this->length2; $i++) { // y
+			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
 		$pass = str_shuffle($pass);
@@ -176,19 +176,19 @@ 
 		$num = str_split($this->Nb);
 		$spe = str_split($this->Spe);
 
-		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+		if (count(array_intersect($password_a, $maj)) < $this->NbMaj) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $num)) < $this->NbNum){
+		if (count(array_intersect($password_a, $num)) < $this->NbNum) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+		if (count(array_intersect($password_a, $spe)) < $this->NbSpe) {
 			return 0;
 		}
 
-		if(!$this->consecutiveInterationSameCharacter($password)){
+		if (!$this->consecutiveInterationSameCharacter($password)) {
 			return 0;
 		}
 
@@ -201,19 +201,19 @@ 
 	 *		@param		string	$password	Password to check
 	 *      @return     int					0 if KO, >0 if OK
 	 */
-	function consecutiveInterationSameCharacter($password){
+	function consecutiveInterationSameCharacter($password) {
 		$last = "";
 		$count = 0;
 		$char = str_split($password);
-		foreach($char as $c){
-			if($c != $last){
+		foreach ($char as $c) {
+			if ($c != $last) {
 				$last = $c;
 				$count = 0;
-			}else{
+			} else {
 				$count++;
 			}
 
-			if($count >= $this->NbRepeat) {
+			if ($count >= $this->NbRepeat) {
 				return 0;
 			}
 		}

htdocs/core/modules/modClickToDial.class.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module de click to Dial
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -45,14 +45,14 @@ 
 
 		$this->family = "technic";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion du Click To Dial";
 
-		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
+		$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 1;
-		$this->picto='phoning';
+		$this->picto = 'phoning';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();