From 792c04083f18b01987a9b711465382a6627fb274 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 9 Mar 2011 22:56:50 +0000
Subject: [PATCH] task #10885: Optimize code

---
 htdocs/lib/date.lib.php | 75 ++++++++++-------------------------------
 1 file changed, 17 insertions(+), 58 deletions(-)

diff --git a/htdocs/lib/date.lib.php b/htdocs/lib/date.lib.php
index c65291c0840..1ed360f6cba 100644
--- a/htdocs/lib/date.lib.php
+++ b/htdocs/lib/date.lib.php
@@ -281,62 +281,24 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
 {
 	global $conf;
 	
-	$date=dol_mktime(0,0,0,$month,$day,$year,$gm);
+	$date = dol_mktime(0,0,0,$month,$day,$year,$gm);
 	
-	// TODO: Modify->the week can begins with any day!
-	
-	if (isset($conf->global->MAIN_START_WEEK))
-	{
-		if ($conf->global->MAIN_START_WEEK==1)
-		{
-			$tmparray = dol_getdate($date,true);
- 
-    		// How many days ahead monday are we?
-    		switch ( $tmparray['wday'] ) 
-    		{
-        		case 0: // we are on sunday
-            		$days = 6;
-            		break;
- 
-        		default: // any other day
-            		$days = $tmparray['wday']-1;
-            		break;
-    		}
- 
-    		$seconds = $days*24*60*60;
-    		$tmpday = date($tmparray[0])-$seconds;
-    		
-		}
-		else
-		{
-        	$tmparray = dol_getdate($date,true);
-    		// substact as many days as days ahead sunday we are
-    		$seconds = $tmparray['wday']*24*60*60;
-    		$tmpday = date($tmparray[0])-$seconds;
-		}
-	}
-	else 
-	{
-		$tmpday = dol_getdate($date,true);
-
-    	// How many days ahead monday are we?
-    	switch ( $tmparray['wday'] ) 
-    	{
-        	case 0: // we are on sunday
-            	$days = 6;
-            	break;
-            	
-	        default: // any other day
-    	        $days = $tmparray['wday']-1;
-        	    break;
-    	}
- 
-    	$seconds = $days*24*60*60;
-    	$tmpday = date($tmparray[0])-$seconds;
-	}
+	//Checking conf of start week
+	$start_week = (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1);
 	
+	$tmparray = dol_getdate($date,true);
+ 	
+	//Calculate days to count 
+	$days = $start_week - $tmparray['wday'];
+ 	if ($days>=1) $days=7-$days;
+ 	$days = abs($days);
+    $seconds = $days*24*60*60;
+    
+    //Get first day of week
+    $tmpday = date($tmparray[0])-$seconds;
 	$tmpday = date("d",$tmpday);
 	
+	//Check first day of week is form this month or not
 	if ($tmpday>$day)
     {
     	$prev_month = $month-1;
@@ -353,17 +315,14 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
     	$prev_month = $month;
 		$prev_year  = $year;
     }
-    
-    $tmpday 	= $tmpday;
-    $prev_month = $prev_month;
-	$prev_year  = $prev_year;
-	
+
+    //Get first day of next week 
 	$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
 	$tmptime-=24*60*60*7;
 	$tmparray=dol_getdate($tmptime,true);
-	
     $prev_day   = $tmparray['mday'];
     
+    //Check first day of week is form this month or not
 	if ($prev_day>$tmpday)
     {
     	$prev_month = $month-1;