Index: includes/functions/PlanetResourceUpdate.php
===================================================================
--- includes/functions/PlanetResourceUpdate.php	(révision 339)
+++ includes/functions/PlanetResourceUpdate.php	(copie de travail)
@@ -41,137 +41,147 @@
 	$MaxCristalStorage              = $CurrentPlanet['crystal_max']   * MAX_OVERFLOW;
 	$MaxDeuteriumStorage            = $CurrentPlanet['deuterium_max'] * MAX_OVERFLOW;
 
-	// Calcul de production lin�aire des divers types
-	$Caps             = array();
-	$BuildTemp        = $CurrentPlanet[ 'temp_max' ];
-
-	for ( $ProdID = 0; $ProdID < 300; $ProdID++ ) {
-		if ( in_array( $ProdID, $reslist['prod']) ) {
-			$BuildLevelFactor = $CurrentPlanet[ $resource[$ProdID]."_porcent" ];
-			$BuildLevel       = $CurrentPlanet[ $resource[$ProdID] ];
-			$Caps['metal_perhour']     +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['metal']     ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
-			$Caps['crystal_perhour']   +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['crystal']   ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
-			$Caps['deuterium_perhour'] +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
-			if ($ProdID < 4) {
-				$Caps['energy_used']   +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * 0.05 ) ) );
-			} elseif ($ProdID >= 4 ) {
-				$Caps['energy_max']    +=  floor( eval  ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * 0.05 ) ) );
-			}
-		}
-	}
-
-	// Il n'y a pas de production de base sur une lune (ni de production tout court d'ailleurs
-	if ($CurrentPlanet['planet_type'] == 3) {
-		$game_config['metal_basic_income']     = 0;
-		$game_config['crystal_basic_income']   = 0;
-		$game_config['deuterium_basic_income'] = 0;
+	// Calcul de production linaire des divers types	
+	if ($CurrentPlanet['planet_type'] == 3) { // Dans le cas d'une lune
+		
 		$CurrentPlanet['metal_perhour']        = 0;
 		$CurrentPlanet['crystal_perhour']      = 0;
 		$CurrentPlanet['deuterium_perhour']    = 0;
 		$CurrentPlanet['energy_used']          = 0;
 		$CurrentPlanet['energy_max']           = 0;
+				
 	} else {
+		
+		$Caps             = array();
+		$BuildTemp        = $CurrentPlanet['temp_max'];	
+		
+		foreach ($reslist['prod'] as $ProdId) {
+		
+			$BuildLevelFactor = $CurrentPlanet[$resource[$ProdId].'_porcent'];
+			$BuildLevel       = $CurrentPlanet[$resource[$ProdId]];
+	
+			$Caps['metal_perhour']     +=  floor( eval  ( $ProdGrid[$ProdId]['formule']['metal']     ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
+			$Caps['crystal_perhour']   +=  floor( eval  ( $ProdGrid[$ProdId]['formule']['crystal']   ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
+			$Caps['deuterium_perhour'] +=  floor( eval  ( $ProdGrid[$ProdId]['formule']['deuterium'] ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
+				
+			if ($ProdId < 4) {
+				$Caps['energy_used']   +=  floor( eval  ( $ProdGrid[$ProdId]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * 0.05 ) ) );
+			} else {
+				$Caps['energy_max']    +=  floor( eval  ( $ProdGrid[$ProdId]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * 0.05 ) ) );
+			}
+		}	
+
 		$CurrentPlanet['metal_perhour']        = $Caps['metal_perhour'];
 		$CurrentPlanet['crystal_perhour']      = $Caps['crystal_perhour'];
 		$CurrentPlanet['deuterium_perhour']    = $Caps['deuterium_perhour'];
 		$CurrentPlanet['energy_used']          = $Caps['energy_used'];
 		$CurrentPlanet['energy_max']           = $Caps['energy_max'];
-	}
 
-	// Depuis quand n'avons nous pas les infos ressources a jours ?
-	$ProductionTime               = ($UpdateTime - $CurrentPlanet['last_update']);
-	$CurrentPlanet['last_update'] = $UpdateTime;
+		// Depuis quand n'avons nous pas les infos ressources a jours ?
+			$ProductionTime               = ($UpdateTime - $CurrentPlanet['last_update']);
+			$CurrentPlanet['last_update'] = $UpdateTime;
 
-	if ($CurrentPlanet['energy_max'] == 0) {
-		// Ah ha ... l'energie max est 0 ...
-		// Soit pas de production d'energie ... Soit mode vacance
-		$CurrentPlanet['metal_perhour']     = $game_config['metal_basic_income'];
-		$CurrentPlanet['crystal_perhour']   = $game_config['crystal_basic_income'];
-		$CurrentPlanet['deuterium_perhour'] = $game_config['deuterium_basic_income'];
-		$production_level            = 100;
-	} elseif ($CurrentPlanet["energy_max"] >= $CurrentPlanet["energy_used"]) {
-		// Cas normal (Y a assez d'energie toutes les mines tournent a plein rendement)
-		$production_level            = 100;
-	} else {
-		// Cas ou il manque de l'energie ... On calcule un pourcentage de production
-		$production_level            = floor(($CurrentPlanet['energy_max'] / $CurrentPlanet['energy_used']) * 100);
-	}
-	// Mise a l'echele des valeurs
-	if       ($production_level > 100) {
-		$production_level = 100;
-	} elseif ($production_level < 0) {
-		$production_level = 0;
-	}
+		if ($CurrentPlanet['energy_max'] == 0) { // Si l'nergie = 0 : mode vacances ou pas de production
 
-	if ( $CurrentPlanet['metal'] <= $MaxMetalStorage ) {
-		$MetalProduction = (($ProductionTime * ($CurrentPlanet['metal_perhour'] / 3600)) * $game_config['resource_multiplier']) * (0.01 * $production_level);
-		$MetalBaseProduc = (($ProductionTime * ($game_config['metal_basic_income'] / 3600 )) * $game_config['resource_multiplier']);
-		$MetalTheorical  = $CurrentPlanet['metal'] + $MetalProduction  +  $MetalBaseProduc;
-		if ( $MetalTheorical <= $MaxMetalStorage ) {
-			$CurrentPlanet['metal']  = $MetalTheorical;
+			$CurrentPlanet['metal_perhour']     = $game_config['metal_basic_income'];
+			$CurrentPlanet['crystal_perhour']   = $game_config['crystal_basic_income'];
+			$CurrentPlanet['deuterium_perhour'] = $game_config['deuterium_basic_income'];
+			$CurrentPlanet['energy_used']		= 0;
+
+			$production_level = 100;
+		
+		} elseif ($CurrentPlanet['energy_max'] >= abs($CurrentPlanet['energy_used'])) {
+			$production_level = 100;
 		} else {
-			$CurrentPlanet['metal']  = $MaxMetalStorage;
+			$production_level = floor(($CurrentPlanet['energy_max']) / abs($CurrentPlanet['energy_used']) * 100);
 		}
-	}
 
-	if ( $CurrentPlanet['crystal'] <= $MaxCristalStorage ) {
-		$CristalProduction = (($ProductionTime * ($CurrentPlanet['crystal_perhour'] / 3600)) * $game_config['resource_multiplier']) * (0.01 * $production_level);
-		$CristalBaseProduc = (($ProductionTime * ($game_config['crystal_basic_income'] / 3600 )) * $game_config['resource_multiplier']);
-		$CristalTheorical  = $CurrentPlanet['crystal'] + $CristalProduction  +  $CristalBaseProduc;
-		if ( $CristalTheorical <= $MaxCristalStorage ) {
-			$CurrentPlanet['crystal']  = $CristalTheorical;
-		} else {
-			$CurrentPlanet['crystal']  = $MaxCristalStorage;
+		$CurrentPlanet['porcent'] = $production_level;
+	
+		if ( $CurrentPlanet['metal'] <= $MaxMetalStorage ) {
+		
+			$MetalProduction = (($ProductionTime * ($CurrentPlanet['metal_perhour'] / 3600)) * $game_config['resource_multiplier']) * (0.01 * $production_level);
+			$MetalBaseProduc = (($ProductionTime * ($game_config['metal_basic_income'] / 3600 )) * $game_config['resource_multiplier']);
+			$MetalTheorical  = $CurrentPlanet['metal'] + $MetalProduction  +  $MetalBaseProduc;
+			
+			if ( $MetalTheorical <= $MaxMetalStorage ) {
+				$CurrentPlanet['metal']  = $MetalTheorical;
+			} else {
+				$CurrentPlanet['metal']  = $MaxMetalStorage;
+			}
+		
 		}
-	}
 
-	if ( $CurrentPlanet['deuterium'] <= $MaxDeuteriumStorage ) {
-		$DeuteriumProduction = (($ProductionTime * ($CurrentPlanet['deuterium_perhour'] / 3600)) * $game_config['resource_multiplier']) * (0.01 * $production_level);
-		$DeuteriumBaseProduc = (($ProductionTime * ($game_config['deuterium_basic_income'] / 3600 )) * $game_config['resource_multiplier']);
-		$DeuteriumTheorical  = $CurrentPlanet['deuterium'] + $DeuteriumProduction  +  $DeuteriumBaseProduc;
-		if ( $DeuteriumTheorical <= $MaxDeuteriumStorage ) {
-			$CurrentPlanet['deuterium']  = $DeuteriumTheorical;
-		} else {
-			$CurrentPlanet['deuterium']  = $MaxDeuteriumStorage;
+		if ( $CurrentPlanet['crystal'] <= $MaxCristalStorage ) {
+			
+			$CristalProduction = (($ProductionTime * ($CurrentPlanet['crystal_perhour'] / 3600)) * $game_config['resource_multiplier']) * (0.01 * $production_level);
+			$CristalBaseProduc = (($ProductionTime * ($game_config['crystal_basic_income'] / 3600 )) * $game_config['resource_multiplier']);
+			$CristalTheorical  = $CurrentPlanet['crystal'] + $CristalProduction  +  $CristalBaseProduc;
+		
+			if ( $CristalTheorical <= $MaxCristalStorage ) {
+				$CurrentPlanet['crystal']  = $CristalTheorical;
+			} else {
+				$CurrentPlanet['crystal']  = $MaxCristalStorage;
+			}
+		
 		}
+
+		if ( $CurrentPlanet['deuterium'] <= $MaxDeuteriumStorage ) {
+		
+			$DeuteriumProduction = (($ProductionTime * ($CurrentPlanet['deuterium_perhour'] / 3600)) * $game_config['resource_multiplier']) * (0.01 * $production_level);
+			$DeuteriumBaseProduc = (($ProductionTime * ($game_config['deuterium_basic_income'] / 3600 )) * $game_config['resource_multiplier']);
+			$DeuteriumTheorical  = $CurrentPlanet['deuterium'] + $DeuteriumProduction  +  $DeuteriumBaseProduc;
+		
+			if ( $DeuteriumTheorical <= $MaxDeuteriumStorage ) {
+				$CurrentPlanet['deuterium']  = $DeuteriumTheorical;
+			} else {
+				$CurrentPlanet['deuterium']  = $MaxDeuteriumStorage;
+			}
+		
+		}
+		
 	}
-
-	if ($Simul == false) {
-		// Gestion de l'eventuelle queue de fabrication d'elements
-		$Builded          = HandleElementBuildingQueue ( $CurrentUser, $CurrentPlanet, $ProductionTime );
-
-		// On enregistre la planete !
-		$QryUpdatePlanet  = "UPDATE {{table}} SET ";
-		$QryUpdatePlanet .= "`metal` = '"            . $CurrentPlanet['metal']             ."', ";
-		$QryUpdatePlanet .= "`crystal` = '"          . $CurrentPlanet['crystal']           ."', ";
-		$QryUpdatePlanet .= "`deuterium` = '"        . $CurrentPlanet['deuterium']         ."', ";
-		$QryUpdatePlanet .= "`last_update` = '"      . $CurrentPlanet['last_update']       ."', ";
-		$QryUpdatePlanet .= "`b_hangar_id` = '"      . $CurrentPlanet['b_hangar_id']       ."', ";
-		$QryUpdatePlanet .= "`metal_perhour` = '"    . $CurrentPlanet['metal_perhour']     ."', ";
-		$QryUpdatePlanet .= "`crystal_perhour` = '"  . $CurrentPlanet['crystal_perhour']   ."', ";
-		$QryUpdatePlanet .= "`deuterium_perhour` = '". $CurrentPlanet['deuterium_perhour'] ."', ";
-		$QryUpdatePlanet .= "`energy_used` = '"      . $CurrentPlanet['energy_used']       ."', ";
-		$QryUpdatePlanet .= "`energy_max` = '"       . $CurrentPlanet['energy_max']        ."', ";
-		// Par hasard des elements etaient finis ....
+	
+	if ($Simul == false) { // Ce n'est pas une simulation, on construit
+		
+		$Builded = HandleElementBuildingQueue ( $CurrentUser, $CurrentPlanet, $ProductionTime );
+			
 		if ( $Builded != '' ) {
 			foreach ( $Builded as $Element => $Count ) {
-				if ($Element <> '') {
-					$QryUpdatePlanet .= "`". $resource[$Element] ."` = '". $CurrentPlanet[$resource[$Element]] ."', ";
-				}
+				if ($Element !== '')
+					$BuildsEnd .= "`". $resource[$Element] ."` = '". $CurrentPlanet[$resource[$Element]] ."', ";
 			}
 		}
-		$QryUpdatePlanet .= "`b_hangar` = '". $CurrentPlanet['b_hangar'] ."' ";
-		$QryUpdatePlanet .= "WHERE ";
-		$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."';";
+				
+		$sql = <<<SQL
+			UPDATE {{table}}
+			SET
+				`metal` = '{$CurrentPlanet['metal']}',
+				`crystal` = '{$CurrentPlanet['crystal']}',
+				`deuterium` = '{$CurrentPlanet['deuterium']}',
+				`last_update` = '{$CurrentPlanet['last_update']}',
+				`b_hangar_id` = '{$CurrentPlanet['b_hangar_id']}',
+				`metal_perhour` = '{$CurrentPlanet['metal_perhour']}',
+				`crystal_perhour` = '{$CurrentPlanet['crystal_perhour']}',
+				`deuterium_perhour` = '{$CurrentPlanet['deuterium_perhour']}',
+				`energy_used` = '{$CurrentPlanet['energy_used']}',
+				`energy_max` = '{$CurrentPlanet['energy_max']}',
+				$BuildsEnd
+				`b_hangar` = '{$CurrentPlanet['b_hangar']}'
+			WHERE
+				`id` = '{$CurrentPlanet['id']}'
+SQL;
 
-		doquery("LOCK TABLE {{table}} WRITE", 'planets');
-		doquery($QryUpdatePlanet, 'planets');
-		doquery("UNLOCK TABLES", '');
+		doquery($sql, 'planets');
+
 	}
+	
+	return $CurrentPlanet;
 
 }
 
 // Revision History
 // - 1.0 Mise en module initiale
 // - 1.1 Mise a jour automatique mines / silos / energie ...
+// - 1.2 Nettoyage du code
 ?>
\ No newline at end of file
Index: language/fr/resources.mo
===================================================================
--- language/fr/resources.mo	(révision 339)
+++ language/fr/resources.mo	(copie de travail)
@@ -43,6 +43,7 @@
 $lang['Calcule'] = 'Calculer';
 $lang['o/o'] = '%';
 $lang['k'] = 'k';
+$lang['Production_porcent'] = 'Facteur de production : ';
 
 // Created by Perberos. All rights reserved (C) 2006 
 // Complet by XNova Team. All rights reversed (C) 2008
Index: resources.php
===================================================================
--- resources.php	(révision 339)
+++ resources.php	(copie de travail)
@@ -41,14 +41,12 @@
 	$RessBodyTPL = gettemplate('resources');
 	$RessRowTPL  = gettemplate('resources_row');
 
-	// Si c'est une lune ... pas de ressources produites
+	// Si c'est une lune ... 
 	if ($CurrentPlanet['planet_type'] == 3) {
-		$game_config['metal_basic_income']     = 0;
-		$game_config['crystal_basic_income']   = 0;
-		$game_config['deuterium_basic_income'] = 0;
+		message('La page de production est indisponible à partir des lunes', 'Indisponible', 'overview.php');
 	}
 
-	$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
+	$ValidList['percent'] = array (  100,  90,  80,  70,  60,  50,  40,  30, 20,  10, 0);
 	$SubQry               = "";
 	if ($_POST) {
 		foreach($_POST as $Field => $Value) {
@@ -67,21 +65,7 @@
 	}
 
 	$parse  = $lang;
-
-	$parse['production_level'] = 100;
-	if       ($CurrentPlanet['energy_max'] == 0 &&
-		$CurrentPlanet['energy_used'] > 0) {
-		$post_porcent = 0;
-	} elseif ($CurrentPlanet['energy_max'] >  0 &&
-		($CurrentPlanet['energy_used'] + $CurrentPlanet['energy_max']) < 0 ) {
-		$post_porcent = floor(($CurrentPlanet['energy_max']) / $CurrentPlanet['energy_used'] * 100);
-	} else {
-		$post_porcent = 100;
-	}
-	if ($post_porcent > 100) {
-		$post_porcent = 100;
-	}
-
+	
 	// -------------------------------------------------------------------------------------------------------
 	// Mise a jour de l'espace de stockage
 	$CurrentPlanet['metal_max']     = (floor (BASE_STORAGE_SIZE * pow (1.5, $CurrentPlanet[ $resource[22] ] ))) * (1 + ($CurrentUser['rpg_stockeur'] * 0.5));
@@ -89,6 +73,11 @@
 	$CurrentPlanet['deuterium_max'] = (floor (BASE_STORAGE_SIZE * pow (1.5, $CurrentPlanet[ $resource[24] ] ))) * (1 + ($CurrentUser['rpg_stockeur'] * 0.5));
 
 	// -------------------------------------------------------------------------------------------------------
+	// Calcul du % de production et mise à jour des ressources
+	$CurrentPlanet = PlanetResourceUpdate($user, $CurrentPlanet, time());
+	
+	// --------------------------------------------------------------------------------------------------------
+	
 	$parse['resource_row']               = "";
 	$CurrentPlanet['metal_perhour']      = 0;
 	$CurrentPlanet['crystal_perhour']    = 0;
@@ -96,73 +85,55 @@
 	$CurrentPlanet['energy_max']         = 0;
 	$CurrentPlanet['energy_used']        = 0;
 	$BuildTemp                           = $CurrentPlanet[ 'temp_max' ];
+	
 	foreach($reslist['prod'] as $ProdID) {
 		if ($CurrentPlanet[$resource[$ProdID]] > 0 && isset($ProdGrid[$ProdID])) {
+			
 			$BuildLevelFactor                    = $CurrentPlanet[ $resource[$ProdID]."_porcent" ];
 			$BuildLevel                          = $CurrentPlanet[ $resource[$ProdID] ];
-			$metal     = floor( eval ( $ProdGrid[$ProdID]['formule']['metal']     ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
-			$crystal   = floor( eval ( $ProdGrid[$ProdID]['formule']['crystal']   ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
-			$deuterium = floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
+			
+			$metal     = floor( eval ( $ProdGrid[$ProdID]['formule']['metal']     ) * ($CurrentPlanet['porcent'] / 100) * ( $game_config['resource_multiplier'] )* ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
+			$crystal   = floor( eval ( $ProdGrid[$ProdID]['formule']['crystal']   ) * ($CurrentPlanet['porcent'] / 100) * ( $game_config['resource_multiplier'] )* ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
+			$deuterium = floor( eval ( $ProdGrid[$ProdID]['formule']['deuterium'] ) * ($CurrentPlanet['porcent'] / 100) * ( $game_config['resource_multiplier'] )* ( 1 + ( $CurrentUser['rpg_geologue']  * 0.05 ) ) );
 			$energy    = floor( eval ( $ProdGrid[$ProdID]['formule']['energy']    ) * ( $game_config['resource_multiplier'] ) * ( 1 + ( $CurrentUser['rpg_ingenieur'] * 0.05 ) ) );
+			
 			if ($energy > 0) {
 				$CurrentPlanet['energy_max']    += $energy;
 			} else {
 				$CurrentPlanet['energy_used']   += $energy;
 			}
+			
 			$CurrentPlanet['metal_perhour']     += $metal;
 			$CurrentPlanet['crystal_perhour']   += $crystal;
 			$CurrentPlanet['deuterium_perhour'] += $deuterium;
-
-			$metal                               = $metal     * 0.01 * $post_porcent;
-			$crystal                             = $crystal   * 0.01 * $post_porcent;
-			$deuterium                           = $deuterium * 0.01 * $post_porcent;
-			$energy                              = $energy    * 0.01 * $post_porcent;
-			$Field                               = $resource[$ProdID] ."_porcent";
+						
 			$CurrRow                             = array();
 			$CurrRow['name']                     = $resource[$ProdID];
-			$CurrRow['porcent']                  = $CurrentPlanet[$Field];
-			for ($Option = 10; $Option >= 0; $Option--) {
-				$OptValue = $Option * 10;
-				if ($Option == $CurrRow['porcent']) {
-					$OptSelected    = " selected=selected";
-				} else {
-					$OptSelected    = "";
-				}
-				$CurrRow['option'] .= "<option value=\"".$OptValue."\"".$OptSelected.">".$OptValue."%</option>";
+			$CurrRow['porcent']                  = $BuildLevelFactor ;
+			
+			foreach ($ValidList['percent'] as $Option) {
+
+				$OptSelected = (($Option / 10) == $CurrRow['porcent']) ? ' selected=selected' : '';
+				$CurrRow['option'] .= "<option value=\"".$Option."\"".$OptSelected.">".$Option."%</option>";
+				
 			}
+			
 			$CurrRow['type']                     = $lang['tech'][$ProdID];
 			$CurrRow['level']                    = ($ProdID > 200) ? $lang['quantity'] : $lang['level'];
 			$CurrRow['level_type']               = $CurrentPlanet[ $resource[$ProdID] ];
-			$CurrRow['metal_type']               = pretty_number ( $metal     );
-			$CurrRow['crystal_type']             = pretty_number ( $crystal   );
-			$CurrRow['deuterium_type']           = pretty_number ( $deuterium );
-			$CurrRow['energy_type']              = pretty_number ( $energy    );
-			$CurrRow['metal_type']               = colorNumber ( $CurrRow['metal_type']     );
-			$CurrRow['crystal_type']             = colorNumber ( $CurrRow['crystal_type']   );
-			$CurrRow['deuterium_type']           = colorNumber ( $CurrRow['deuterium_type'] );
-			$CurrRow['energy_type']              = colorNumber ( $CurrRow['energy_type']    );
+			
+			$CurrRow['metal_type']               = colorNumber( pretty_number($metal) );
+			$CurrRow['crystal_type']             = colorNumber( pretty_number($crystal) );
+			$CurrRow['deuterium_type']           = colorNumber( pretty_number($deuterium) );
+			$CurrRow['energy_type']              = colorNumber( pretty_number($energy) );
 
 			$parse['resource_row']              .= parsetemplate ( $RessRowTPL, $CurrRow );
 		}
 	}
 
-	$parse['Production_of_resources_in_the_planet'] =
-	str_replace('%s', $CurrentPlanet['name'], $lang['Production_of_resources_in_the_planet']);
-	if       ($CurrentPlanet['energy_max'] == 0 &&
-		$CurrentPlanet['energy_used'] > 0) {
-		$parse['production_level'] = 0;
-	} elseif ($CurrentPlanet['energy_max']  > 0 &&
-		abs($CurrentPlanet['energy_used']) > $CurrentPlanet['energy_max']) {
-		$parse['production_level'] = floor(($CurrentPlanet['energy_max']) / $CurrentPlanet['energy_used'] * 100);
-	} elseif ($CurrentPlanet['energy_max'] == 0 &&
-		abs($CurrentPlanet['energy_used']) > $CurrentPlanet['energy_max']) {
-		$parse['production_level'] = 0;
-	} else {
-		$parse['production_level'] = 100;
-	}
-	if ($parse['production_level'] > 100) {
-		$parse['production_level'] = 100;
-	}
+	$parse['Production_of_resources_in_the_planet'] = str_replace('%s', $CurrentPlanet['name'], $lang['Production_of_resources_in_the_planet']);
+	
+	$parse['production_level'] = $CurrentPlanet['porcent'];
 
 	$parse['metal_basic_income']     = $game_config['metal_basic_income']     * $game_config['resource_multiplier'];
 	$parse['crystal_basic_income']   = $game_config['crystal_basic_income']   * $game_config['resource_multiplier'];
@@ -190,22 +161,22 @@
 	}
 	$parse['deuterium_max']        .= pretty_number($CurrentPlanet['deuterium_max'] / 1000) ." ". $lang['k']."</font>";
 
-	$parse['metal_total']           = colorNumber( pretty_number( floor( ( $CurrentPlanet['metal_perhour']     * 0.01 * $parse['production_level'] ) + $parse['metal_basic_income'])));
-	$parse['crystal_total']         = colorNumber( pretty_number( floor( ( $CurrentPlanet['crystal_perhour']   * 0.01 * $parse['production_level'] ) + $parse['crystal_basic_income'])));
-	$parse['deuterium_total']       = colorNumber( pretty_number( floor( ( $CurrentPlanet['deuterium_perhour'] * 0.01 * $parse['production_level'] ) + $parse['deuterium_basic_income'])));
-	$parse['energy_total']          = colorNumber( pretty_number( floor( ( $CurrentPlanet['energy_max'] + $parse['energy_basic_income']    ) + $CurrentPlanet['energy_used'] ) ) );
+	$parse['metal_total']           = colorNumber( pretty_number($CurrentPlanet['metal_perhour'] + $parse['metal_basic_income']) );
+	$parse['crystal_total']         = colorNumber( pretty_number($CurrentPlanet['crystal_perhour']+ $parse['crystal_basic_income']) );
+	$parse['deuterium_total']       = colorNumber( pretty_number($CurrentPlanet['deuterium_perhour'] + $parse['deuterium_basic_income']) );
+	$parse['energy_total']          = colorNumber( pretty_number( ($CurrentPlanet['energy_max'] + $parse['energy_basic_income']) + $CurrentPlanet['energy_used']) );
 
-	$parse['daily_metal']           = floor($CurrentPlanet['metal_perhour']     * 24      * 0.01 * $parse['production_level'] + $parse['metal_basic_income']     * 24      );
-	$parse['weekly_metal']          = floor($CurrentPlanet['metal_perhour']     * 24 * 7  * 0.01 * $parse['production_level'] + $parse['metal_basic_income']     * 24 * 7  );
-	$parse['monthly_metal']         = floor($CurrentPlanet['metal_perhour']     * 24 * 30 * 0.01 * $parse['production_level'] + $parse['metal_basic_income']     * 24 * 30 );
+	$parse['daily_metal']           = floor( ($CurrentPlanet['metal_perhour'] + $parse['metal_basic_income']) * 24 );
+	$parse['weekly_metal']          = floor($parse['daily_metal'] * 7);
+	$parse['monthly_metal']         = floor($parse['daily_metal'] * 30);
 
-	$parse['daily_crystal']         = floor($CurrentPlanet['crystal_perhour']   * 24      * 0.01 * $parse['production_level'] + $parse['crystal_basic_income']   * 24      );
-	$parse['weekly_crystal']        = floor($CurrentPlanet['crystal_perhour']   * 24 * 7  * 0.01 * $parse['production_level'] + $parse['crystal_basic_income']   * 24 * 7  );
-	$parse['monthly_crystal']       = floor($CurrentPlanet['crystal_perhour']   * 24 * 30 * 0.01 * $parse['production_level'] + $parse['crystal_basic_income']   * 24 * 30 );
+	$parse['daily_crystal']         = floor( ($CurrentPlanet['crystal_perhour'] + $parse['crystal_basic_income']) * 24);
+	$parse['weekly_crystal']        = floor($parse['daily_crystal'] * 7);
+	$parse['monthly_crystal']       = floor($parse['daily_crystal'] * 30);
 
-	$parse['daily_deuterium']       = floor($CurrentPlanet['deuterium_perhour'] * 24      * 0.01 * $parse['production_level'] + $parse['deuterium_basic_income'] * 24      );
-	$parse['weekly_deuterium']      = floor($CurrentPlanet['deuterium_perhour'] * 24 * 7  * 0.01 * $parse['production_level'] + $parse['deuterium_basic_income'] * 24 * 7  );
-	$parse['monthly_deuterium']     = floor($CurrentPlanet['deuterium_perhour'] * 24 * 30 * 0.01 * $parse['production_level'] + $parse['deuterium_basic_income'] * 24 * 30 );
+	$parse['daily_deuterium']       = floor( ($CurrentPlanet['deuterium_perhour'] + $parse['deuterium_basic_income']) * 24);
+	$parse['weekly_deuterium']      = floor($parse['daily_deuterium'] * 7 );
+	$parse['monthly_deuterium']     = floor($parse['daily_deuterium'] * 30);
 
 	$parse['daily_metal']           = colorNumber(pretty_number($parse['daily_metal']));
 	$parse['weekly_metal']          = colorNumber(pretty_number($parse['weekly_metal']));
@@ -222,6 +193,7 @@
 	$parse['metal_storage']         = floor($CurrentPlanet['metal']     / $CurrentPlanet['metal_max']     * 100) . $lang['o/o'];
 	$parse['crystal_storage']       = floor($CurrentPlanet['crystal']   / $CurrentPlanet['crystal_max']   * 100) . $lang['o/o'];
 	$parse['deuterium_storage']     = floor($CurrentPlanet['deuterium'] / $CurrentPlanet['deuterium_max'] * 100) . $lang['o/o'];
+	
 	$parse['metal_storage_bar']     = floor(($CurrentPlanet['metal']     / $CurrentPlanet['metal_max']     * 100) * 2.5);
 	$parse['crystal_storage_bar']   = floor(($CurrentPlanet['crystal']   / $CurrentPlanet['crystal_max']   * 100) * 2.5);
 	$parse['deuterium_storage_bar'] = floor(($CurrentPlanet['deuterium'] / $CurrentPlanet['deuterium_max'] * 100) * 2.5);
@@ -257,20 +229,22 @@
 	$parse['production_level']     = "{$parse['production_level']}%";
 	$parse['production_level_barcolor'] = '#00ff00';
 
-	$QryUpdatePlanet  = "UPDATE {{table}} SET ";
-	$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."' ";
-	$QryUpdatePlanet .= $SubQry;
-	$QryUpdatePlanet .= "WHERE ";
-	$QryUpdatePlanet .= "`id` = '". $CurrentPlanet['id'] ."';";
-	doquery( $QryUpdatePlanet, 'planets');
-
+		$sql = <<<SQL
+			UPDATE {{table}}
+			SET
+				`energy_max` = '{$CurrentPlanet['energy_max']}'
+				$SubQry
+			WHERE
+				`id` = '{$CurrentPlanet['id']}'
+SQL;
+	doquery($sql, 'planets');
 	$page = parsetemplate( $RessBodyTPL, $parse );
 
 	return $page;
 }
 
 	$Page = BuildRessourcePage ( $user, $planetrow );
-	display( $Page, $lang['Resources'] );
+	display( $Page, $lang['Resources'], true);
 
 // -----------------------------------------------------------------------------------------------------------
 // History version
Index: templates/OpenGame/resources.tpl
===================================================================
--- templates/OpenGame/resources.tpl	(révision 339)
+++ templates/OpenGame/resources.tpl	(copie de travail)
@@ -1,11 +1,11 @@
 <br>
-<form action="" method="post">
+<form action="resources.php" method="post">
 <table width="569">
 <tbody>
 <tr>
 	<td class="c" colspan="5">{Production_of_resources_in_the_planet}</td>
 </tr><tr>
-	<th height="22"></th>
+	<th height="22">{Production_porcent}{production_level}</th>
 	<th width="60">{Metal}</th>
 	<th width="60">{Crystal}</th>
 	<th width="60">{Deuterium}</th>
@@ -24,7 +24,7 @@
 	<td class="k">{crystal_max}</td>
 	<td class="k">{deuterium_max}</td>
 	<td class="k"><font color="#00ff00">-</font></td>
-	<td class="k"><input name="action" value="{Calcule}" type="submit"></td>
+	<td class="k"><input value="{Calcule}" type="submit"></td>
 </tr><tr>
 	<th height="22">Total:</th>
 	<td class="k">{metal_total}</td>