Merge lp:~pieroliste/ocsinventory-ocsreports/trunk into lp:ocsinventory-ocsreports

[Pierfrancesco Passerini]

Some cosmetic fix and languages updates
HAPPY NEW YEAR !!

[lp:~pieroliste/ocsinventory-ocsreports/trunk]

602. By Erwan on 2011-01-10

merge with passero branch

=== modified file 'install.php'
--- install.php	2010-12-28 17:07:19 +0000
+++ install.php	2011-01-02 18:01:25 +0000
@@ -40,7 +40,7 @@
    echo "<center><br><font color='green'><b>" . $l->g(2031) . " " .
    											    $valUpd["tvalue"] . 
    											    " " . $l->g(2032) . 
-   											    " (" . GUI_VER . ") " . 
+   											    " (" . GUI_VER . "). " .
    											    $l->g(2033) . "</b></red><br></center>";
 
 if( isset($fromdbconfig_out) && $fromdbconfig_out==true)
@@ -99,13 +99,10 @@
 $valBumf = return_bytes( $valTumf );
 
 if( $valBumf>$valBpms )
-	$MaxAvail = $valTpms;
+	$MaxAvail = trim($valTpms,"m");
 else
-	$MaxAvail = $valTumf;
-
-echo "<br><center><font color=orange><b>" . $l->g(2040) . 
-									  " " . $MaxAvail . 
-									  "<br>" . $l->g(2041) . "</b></font></center>";
+	$MaxAvail = trim($valTumf,"m");
+echo "<br><center><font color=orange><b>" . $l->g(2040) . " " . $MaxAvail . $l->g(1240) . "<br>" . $l->g(2041) . "</b></font></center>";
 
 
 if( isset($_POST["name"])) {
@@ -134,7 +131,7 @@
 }
 
 if( ! $instOk ) {
-	echo "<br><b><font color=red size=2>".$l->g(2102)."</font></b>";
+	echo "<br><b><font color=red size=2>".$l->g(2102)."<br></font></b>";
 	echo "<br><form name='fsub' action='install.php' method='POST'><table width='100%'>
 	<tr>
 		<td align='right' width='30%'>
@@ -439,7 +436,7 @@
 }
 
 if( ! $erralter ) {
-	echo "</b></font></center><br><center><font color=green><b>" . $l->g(2063) . " (" . $nbconv . " " . $l->g(2064) . "</b></font></center>";
+	echo "</b></font></center><br><center><font color=green><b>" . $l->g(2063) . " (" . $nbconv . " " . $l->g(2064) . ")" . "</b></font></center>";
 }
 	
 if($nberr) {

=== modified file 'plugins/language/english/english.txt'
--- plugins/language/english/english.txt	2010-12-28 17:37:57 +0000
+++ plugins/language/english/english.txt	2011-01-02 18:01:25 +0000
@@ -26,6 +26,7 @@
 49 Name
 50 Swap
 51 Comments
+52 Visible
 53 Description
 54 Processor(s)
 55 Number
@@ -128,7 +129,7 @@
 219 uninventoried network interfaces
 220 deleted
 221 IP gathering computers
-222 Warning ! All selected computers are going to be merged in a single computer ! Are you sure ?
+222 Warning ! All selected computers are going to be merged in a single computer! Are you sure?
 223 Information
 224 Value
 225 Admininfo
@@ -202,7 +203,7 @@
 293 Network devices types
 294 Subnet names
 295 Click to edit
-296 Uid
+296 Id
 297 Can't write in directory
 298 All fields must be filled
 299 Invalid IP adress (must be: x.x.x.x)
@@ -227,7 +228,7 @@
 318 DNS name
 319 Network analyze results
 320 This analyze was already done on
-321 do you want to see cached data ?
+321 do you want to see cached data?
 322 Data from cache
 323 generated on
 324 HOSTS EVALUATED AS
@@ -358,7 +359,7 @@
 465 Package activation
 466 WARNING: Can't find information file at
 467 WARNING: Can't find fragments files at
-468 Are you sure to want to activate this package ?
+468 Are you sure to want to activate this package?
 469 Package activated, it can now be affected
 470 Https url
 471 Fragments url
@@ -415,7 +416,7 @@
 522 Standard computer
 523 Revert back to standard state
 524 NEVER affect again
-525 ARE YOU SURE ?
+525 ARE YOU SURE?
 526 NO COMPUTER AFFECTED
 527 January
 528 February
@@ -783,7 +784,7 @@
 895 TAG Modification
 898 Add an annotation
 899 Writer
-900 Do you really want to delete selection ?
+900 Do you really want to delete selection?
 901 Action on the query result
 902 Action on the result of selection
 903 You must fill the explanation field
@@ -1167,11 +1168,10 @@
 2021 YOUR GUI LOGS DIRECTORY IS NOT WRITABLE
 
 
-
 2030 OCS-NG Inventory Installation
 2031 Current installed version
 2032 is lower than this version
-2033 automatic install launched
+2033 Automatic install launched.
 2034 DB configuration not completed. Automatic install launched
 2035 ERROR: Sessions for PHP is not properly installed.<br>Try installing the php-session package.
 2036 WARNING: XML for PHP is not properly installed, you will not be able to use ipdiscover-util.

=== modified file 'plugins/language/french/french.txt'
--- plugins/language/french/french.txt	2010-12-28 17:07:19 +0000
+++ plugins/language/french/french.txt	2011-01-02 18:01:25 +0000
@@ -24,8 +24,9 @@
 46 Dernier inventaire
 48 Affichage système
 49 Nom
-50 Espace de Swap 
+50 Espace de Swap
 51 Commentaires
+52 Visible
 53 Description
 54 Processeur(s)
 55 Nombre
@@ -1168,7 +1169,7 @@
 2030 Installation d'OCS-NG Inventory
 2031 version actuellement installée
 2032 est inférieur à cette version
-2033 Installation automatique lancée
+2033 Installation automatique lancée.
 2034 Le fichiers de configuration de BDD n'est pas valide. Installation automatique lancée
 2035 ERREUR: Les sessions pour PHP ne sont pas installées correctement. <br> Essayez d'installer le paquet php-session.
 2036 AVERTISSEMENT: XML pour PHP n'est pas installé correctement, vous ne serez pas en mesure d'utiliser ipdiscover-util.

=== modified file 'plugins/language/italian/italian.txt'
--- plugins/language/italian/italian.txt	2010-12-28 17:37:57 +0000
+++ plugins/language/italian/italian.txt	2011-01-02 18:01:25 +0000
@@ -321,7 +321,7 @@
 428 Distribuzione
 429 Frequenza
 430 Elaborazione di massa
-431 Attivato
+431 Attivare
 432 Non notificato
 433 Riguarda
 434 Generatore pacchetti
@@ -462,7 +462,7 @@
 569 CPU (MHz)
 570 Aiuto
 571 Convalida tutti
-572 Fatto
+572 Eseguito
 573 Errore
 574 Statistiche
 575 Non interessati non notificati
@@ -710,7 +710,7 @@
 822 Personalizzato
 823 Predefinito
 824 Attivazione di log dell'interfaccia
-825 Directory di log
+825 Directory dei log
 826 Indirizzo dove trovare i file del pacchetto Teledeploy da attivare
 827 Indirizzo dove trovare il file INFO del pacchetto da attivare
 828 Cancella i computer il cui inventario è più vecchio di
@@ -836,7 +836,7 @@
 950 NOME FILE
 951 CREATO IL
 952 MODIFICATO IL
-953 GRANDEZZA
+953 DIMENSIONI
 954 Si è verificata una perdita di sessione
 955 NESSUN SISTEMA TROVATO NEL DATABASE
 956 Tutti gli errori
@@ -1167,8 +1167,8 @@
 
 2030 Installazione OCS-NG Inventory
 2031 La versione attualmente installata
-2032 è precedente rispetto a questa versione
-2033 è stata avviata l'installazione automatica
+2032 è precedente a questa versione
+2033 E' stata avviata l'installazione automatica.
 2034 configurazione del DB incompleta. Lancio l'installazione automatica
 2035 ERRORE: PHP sessions non installate correttamente.<br>Installa il pacchetto php-session.
 2036 ATTENZIONE: l'estensione XML per PHP non installata correttamente, non sarai in grado di utilizzare ipdiscover-util.
@@ -1226,8 +1226,8 @@
 2093 Pulizia NETMAP...
 2094 ERRORE: non posso pulire NETMAP
 2095 linee NETMAP cancellate
-2096 Per favore inserisci il nome dell'etichetta da inserire nella finestra di input dei client:
-2097 Non inserire nulla se non vuoi far apparire il popup al lancio dell'agente
+2096 Per favore inserisci il valore dell'etichetta che verrà mostrata nella finestra di input dei client:
+2097 Non inserire nulla se non vuoi far apparire il popup ad ogni esecuzione dell'agente
 2098 ERRORE: l'estensione ZIP per PHP non installata correttamente.<br>Prova ad abilitare la voce extension=php_zip.dll (Windows) rimuovendo il punto e virgola nel file php.ini, oppure prova ad installare il pacchetto libphp-pclzip (Linux).
 2099 ERRORE: le credenziali MySQL fornite non hanno i diritti necessari per la creazione del database
 2100 Aggiorna le informazioni degli account

=== modified file 'plugins/main_sections/ms_all_soft/ms_all_soft.php'
--- plugins/main_sections/ms_all_soft/ms_all_soft.php	2010-12-21 14:06:52 +0000
+++ plugins/main_sections/ms_all_soft/ms_all_soft.php	2011-01-02 18:01:25 +0000
@@ -191,15 +191,15 @@
 
 echo "<br><div class='mvt_bordure'>";
 
-echo "<b>".$l->g(735)."</b><BR>";
+echo "<b>".$l->g(735)."</b><br><br>";
 echo $l->g(382).": ".show_modif($protectedPost['NAME_RESTRICT'],'NAME_RESTRICT',0);
 echo "&nbsp;".$l->g(381).": ".show_modif(array('<'=>'<','>'=>'>','='=>'='),'COMPAR',2);
 echo show_modif($protectedPost['NBRE'],'NBRE',0,'',array('MAXLENGTH'=>100,'SIZE'=>10,'JAVASCRIPT'=>$numeric));
 //echo "<input type='input' name='NBRE' value='".$protectedPost['NBRE']."' ".$numeric.">";
-	echo "<br><a href='index.php?".PAG_INDEX."=".$pages_refs['ms_soft_csv']."&no_header=1&soft=".$protectedPost['NAME_RESTRICT']."&nb=".$protectedPost['NBRE']."&comp=".htmlentities($protectedPost['COMPAR'])."'>".$l->g(183)." ".$l->g(765)."</a>";
+echo "<br><a href='index.php?".PAG_INDEX."=".$pages_refs['ms_soft_csv']."&no_header=1&soft=".$protectedPost['NAME_RESTRICT']."&nb=".$protectedPost['NBRE']."&comp=".htmlentities($protectedPost['COMPAR'])."'><br>".$l->g(183)." ".$l->g(765)."<br></a>";
 if ($protectedPost['COMPAR'] == '<' and $protectedPost['NBRE']<=15 and $protectedPost['NBRE'] != "")
-echo "<br><a href='index.php?".PAG_INDEX."=".$pages_refs['ms_soft_csv']."&no_header=1&soft=".$protectedPost['NAME_RESTRICT']."&nb=".$protectedPost['NBRE']."&comp=".htmlentities($protectedPost['COMPAR'])."&all_computers=yes'>".$l->g(912)."</a>";		
-	echo "<br><input type='submit' value='".$l->g(393)."' name='SUBMIT_FORM'><input type='submit' value='".$l->g(396)."' name='RESET'>";
+echo "<br><a href='index.php?".PAG_INDEX."=".$pages_refs['ms_soft_csv']."&no_header=1&soft=".$protectedPost['NAME_RESTRICT']."&nb=".$protectedPost['NBRE']."&comp=".htmlentities($protectedPost['COMPAR'])."&all_computers=yes'>".$l->g(912)."</a><br>";
+echo "<br><input type='submit' value='".$l->g(393)."' name='SUBMIT_FORM'><input type='submit' value='".$l->g(396)."' name='RESET'>";
 
 echo '</div>';
 echo '</div>';

=== modified file 'plugins/main_sections/ms_dict/ms_dict.php'
--- plugins/main_sections/ms_dict/ms_dict.php	2010-12-13 16:24:17 +0000
+++ plugins/main_sections/ms_dict/ms_dict.php	2011-01-02 18:01:25 +0000
@@ -257,7 +257,7 @@
 }
 echo "</td></tr>";
 $search=show_modif(stripslashes($protectedPost['search']),"search",'0');
-$trans= "<input name='all_item' id='all_item' type='checkbox' ".(isset($protectedPost['all_item'])? " checked ": "").">".$l->g(384);
+$trans= "<input name='all_item' id='all_item' type='checkbox' ".(isset($protectedPost['all_item'])? " checked ": "").">".$l->g(384) . " ";
 //r�cup�ration de toutes les cat�gories
 $sql_list_categories="select distinct(formatted) name from dico_soft where formatted!=extracted";
 $result_list_categories = mysql_query( $sql_list_categories, $_SESSION['OCS']["readServer"]);

=== modified file 'plugins/main_sections/ms_groups/ms_groups.php'
--- plugins/main_sections/ms_groups/ms_groups.php	2010-11-29 17:15:30 +0000
+++ plugins/main_sections/ms_groups/ms_groups.php	2011-01-02 18:01:25 +0000
@@ -82,9 +82,9 @@
 		$list_fields['CHECK']= 'ID';
 	$list_fields['SUP']= 'ID';	
 }
-//changement de nom � l'affichage des champs	
-$tab_options['LBL']['CHECK']="Visible";
-$tab_options['LBL']['GROUP_NAME']="Nom";
+//changement de nom � l'affichage des champs
+$tab_options['LBL']['CHECK']=$l->g(52);
+$tab_options['LBL']['GROUP_NAME']=$l->g(49);
 
 $table_name="LIST_GROUPS";
 $default_fields= array('GROUP_NAME'=>'GROUP_NAME','DESCRIPTION'=>'DESCRIPTION','CREATE'=>'CREATE','NBRE'=>'NBRE','SUP'=>'SUP','CHECK'=>'CHECK');

=== modified file 'plugins/main_sections/ms_logs/ms_logs.php'
--- plugins/main_sections/ms_logs/ms_logs.php	2010-12-17 21:16:31 +0000
+++ plugins/main_sections/ms_logs/ms_logs.php	2011-01-02 18:01:25 +0000
@@ -36,8 +36,8 @@
 		}
 		$sql.="select '%s' ".$name.",'%s' ".$date_create.",'%s' ".$date_modif.",'%s' ".$size." union ";
 		array_push($arg,$value);
-		array_push($arg,$data['date_create'][$id]);
-		array_push($arg,$data['date_modif'][$id]);
+		array_push($arg,rtrim($data['date_create'][$id],"."));
+		array_push($arg,rtrim($data['date_modif'][$id],"."));
 		array_push($arg,round($data['size'][$id]/1024,3)." ".$l->g(516));
 	}
 	$sql=substr($sql,0,-6);

=== modified file 'plugins/main_sections/ms_teledeploy/ms_custom_pack.php' (properties changed: +x to -x)
--- plugins/main_sections/ms_teledeploy/ms_custom_pack.php	2010-12-06 17:01:53 +0000
+++ plugins/main_sections/ms_teledeploy/ms_custom_pack.php	2011-01-02 18:01:25 +0000
@@ -1,179 +1,179 @@
 <?php
-//====================================================================================
-// OCS INVENTORY REPORTS
-// Copyleft Erwan GOALOU 2010 (erwan(at)ocsinventory-ng(pt)org)
-// Web: http://www.ocsinventory-ng.org
-//
-// This code is open source and may be copied and modified as long as the source
-// code is always made freely available.
-// Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
-//====================================================================================
-
-require_once('require/function_telediff.php');
-require_once('require/function_search.php');
-require_once('require/function_telediff_wk.php');
-//TELEDIFF_WK
-$activate=option_conf_activate('TELEDIFF_WK');
-if ($activate){
-	echo "<font color = green><b>" . $l->g(1105) . "
-			<br>" . $l->g(1108) . "</b></font>";
-	//recherche du niveau d'affectation du paquet
-	$conf_Wk=look_config_default_values(array('IT_SET_PERIM','IT_SET_NAME_TEST',
-									   'IT_SET_NAME_LIMIT','IT_SET_TAG_NAME',
-									   'IT_SET_NIV_TEST','IT_SET_NIV_REST'));
-	//savoir comment sont définis les périmètres
-	if ($conf_Wk['ivalue']['IT_SET_PERIM'] == 1){
-		$perim='TAG';
-		msg_warning($l->g(1190) . " " .$conf_Wk['tvalue']['IT_SET_NIV_REST']);
-		msg_info($l->g(1191) . " " .$perim);
-	}else{
-		$perim='GROUPS';
-		//si on vient de la page des groupes	
-		if ($protectedGet['origine'] == "group"){
-			//recherche des infos du groupe
-			$queryMachine   = "SELECT REQUEST,
-						  CREATE_TIME,
-						  NAME,
-						  XMLDEF,
-						  DESCRIPTION,LASTDATE,OSCOMMENTS,DEVICEID FROM hardware h left join groups g on g.hardware_id=h.id 
-				  WHERE ID='".$protectedGet['idchecked']."' AND (deviceid ='_SYSTEMGROUP_' or deviceid='_DOWNLOADGROUP_')";
-			$result   = mysql_query( $queryMachine, $_SESSION['OCS']["readServer"] ) or mysql_error($_SESSION['OCS']["readServer"]);
-			$item     = mysql_fetch_object($result);
-			print_r($conf_Wk);
-			$msg_wk="";
-			//si ce groupe est défini comme un groupe de test
-			if ($item->NAME == $conf_Wk['tvalue']['IT_SET_NAME_TEST']){
-				$restrict=$conf_Wk['tvalue']['IT_SET_NIV_TEST'];
-				$msg_wk="<br>".$l->g(1192);
-			}		
-			//si ce groupe est défini comme un groupe de périmètre restraint	
-			if ($item->NAME == $conf_Wk['tvalue']['IT_SET_NAME_LIMIT']){
-				if (!isset($restrict))
-				$restrict=$conf_Wk['tvalue']['IT_SET_NIV_REST'];
-				$msg_wk="<br>".$l->g(1193);
-			}
-			//si le groupe n'est pas pris en compte dans le 
-			//système de workflow de télédiff
-			if (!isset($restrict)){
-				
-				$msg_wk=$l->g(1194) . " " . $conf_Wk['tvalue']['IT_SET_NIV_REST'] . " " . $l->g(1195);
-				
-				
-			}
-			
-		}
-
-		
-	}
-	
-		
-	if ($msg_wk != '')
-		msg_info($msg_wk);
-	
-}
-$form_name="pack_affect";
-echo "<form name='".$form_name."' id='".$form_name."' method='POST' action=''>";
-$list_id=multi_lot($form_name,$l->g(601));
-
-if ($protectedPost['SELECT'] != ''){
-	if ($protectedGet['origine'] == "group"){
-		$form_to_reload='config_group';
-	}elseif ($protectedGet['origine'] == "mach"){
-		$form_to_reload='config_mach';
-	}
-	if ($protectedPost['onglet'] == 'MACH')
-	$nb_affect=active_mach($list_id,$protectedPost['SELECT']);
-	if ($protectedPost['onglet'] == 'SERV_GROUP')
-	$nb_affect=active_serv($list_id,$protectedPost['SELECT'],$protectedPost['rule_choise']);
-	msg_success($nb_affect." ".$l->g(604));
-	if (isset($form_to_reload))
-	echo "<script language='javascript'> window.opener.document.".$form_to_reload.".submit();</script>";
-}
-if ($protectedPost['sens'] == "")
-	$protectedPost['sens']='DESC';
-
-
-if ($protectedPost['onglet'] == "")
-$protectedPost['onglet'] = 'MACH';
-
-
-$def_onglets['MACH']=$l->g(980); //DYNAMICS GROUPS
-$def_onglets['SERV_GROUP']=$l->g(981); //STATICS GROUPS
-
-//show tab
-if ($list_id){	
-	onglet($def_onglets,$form_name,'onglet',7);
-	echo "<table ALIGN = 'Center' class='onglet'><tr><td align =center><tr><td align =center>";
-	if ($protectedPost['onglet'] == 'SERV_GROUP'){
-		$sql_rules="select distinct rule,rule_name from download_affect_rules order by 1";
-			$res_rules = mysql_query( $sql_rules, $_SESSION['OCS']["readServer"] ) or die(mysql_error($_SESSION['OCS']["readServer"]));
-			$nb_rule=0;
-			while( $val_rules = mysql_fetch_array($res_rules)) {
-				$first=$val_rules['rule'];
-				$list_rules[$val_rules['rule']]=$val_rules['rule_name'];
-				$nb_rule++;
-			}
-		if ($nb_rule>1){
-		$select_choise=$l->g(668).show_modif($list_rules,'rule_choise',2,$form_name);	
-		echo $select_choise;
-		}elseif($nb_rule == 1){
-			$protectedPost['rule_choise']=$first;
-			echo "<input type=hidden value='".$first."' name='rule_choise' id='rule_choise'>";
-		}elseif ($nb_rule == 0){
-			msg_error($l->g(982));
-		}
-	}
-	
-	if(($protectedPost['onglet'] == 'MACH') 
-		or ($protectedPost['onglet'] == 'SERV_GROUP' and $protectedPost['rule_choise'] != '')){
-			//recherche de toutes les r�gles pour les serveurs de redistribution
-		$list_fields= array('FILE_ID'=>'e.FILEID',
+//====================================================================================
+// OCS INVENTORY REPORTS
+// Copyleft Erwan GOALOU 2010 (erwan(at)ocsinventory-ng(pt)org)
+// Web: http://www.ocsinventory-ng.org
+//
+// This code is open source and may be copied and modified as long as the source
+// code is always made freely available.
+// Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
+//====================================================================================
+
+require_once('require/function_telediff.php');
+require_once('require/function_search.php');
+require_once('require/function_telediff_wk.php');
+//TELEDIFF_WK
+$activate=option_conf_activate('TELEDIFF_WK');
+if ($activate){
+	echo "<font color = green><b>" . $l->g(1105) . "
+			<br>" . $l->g(1108) . "</b></font>";
+	//recherche du niveau d'affectation du paquet
+	$conf_Wk=look_config_default_values(array('IT_SET_PERIM','IT_SET_NAME_TEST',
+									   'IT_SET_NAME_LIMIT','IT_SET_TAG_NAME',
+									   'IT_SET_NIV_TEST','IT_SET_NIV_REST'));
+	//savoir comment sont définis les périmètres
+	if ($conf_Wk['ivalue']['IT_SET_PERIM'] == 1){
+		$perim='TAG';
+		msg_warning($l->g(1190) . " " .$conf_Wk['tvalue']['IT_SET_NIV_REST']);
+		msg_info($l->g(1191) . " " .$perim);
+	}else{
+		$perim='GROUPS';
+		//si on vient de la page des groupes	
+		if ($protectedGet['origine'] == "group"){
+			//recherche des infos du groupe
+			$queryMachine   = "SELECT REQUEST,
+						  CREATE_TIME,
+						  NAME,
+						  XMLDEF,
+						  DESCRIPTION,LASTDATE,OSCOMMENTS,DEVICEID FROM hardware h left join groups g on g.hardware_id=h.id 
+				  WHERE ID='".$protectedGet['idchecked']."' AND (deviceid ='_SYSTEMGROUP_' or deviceid='_DOWNLOADGROUP_')";
+			$result   = mysql_query( $queryMachine, $_SESSION['OCS']["readServer"] ) or mysql_error($_SESSION['OCS']["readServer"]);
+			$item     = mysql_fetch_object($result);
+			print_r($conf_Wk);
+			$msg_wk="";
+			//si ce groupe est défini comme un groupe de test
+			if ($item->NAME == $conf_Wk['tvalue']['IT_SET_NAME_TEST']){
+				$restrict=$conf_Wk['tvalue']['IT_SET_NIV_TEST'];
+				$msg_wk="<br>".$l->g(1192);
+			}		
+			//si ce groupe est défini comme un groupe de périmètre restraint	
+			if ($item->NAME == $conf_Wk['tvalue']['IT_SET_NAME_LIMIT']){
+				if (!isset($restrict))
+				$restrict=$conf_Wk['tvalue']['IT_SET_NIV_REST'];
+				$msg_wk="<br>".$l->g(1193);
+			}
+			//si le groupe n'est pas pris en compte dans le 
+			//système de workflow de télédiff
+			if (!isset($restrict)){
+				
+				$msg_wk=$l->g(1194) . " " . $conf_Wk['tvalue']['IT_SET_NIV_REST'] . " " . $l->g(1195);
+				
+				
+			}
+			
+		}
+
+		
+	}
+	
+		
+	if ($msg_wk != '')
+		msg_info($msg_wk);
+	
+}
+$form_name="pack_affect";
+echo "<form name='".$form_name."' id='".$form_name."' method='POST' action=''>";
+$list_id=multi_lot($form_name,$l->g(601));
+
+if ($protectedPost['SELECT'] != ''){
+	if ($protectedGet['origine'] == "group"){
+		$form_to_reload='config_group';
+	}elseif ($protectedGet['origine'] == "mach"){
+		$form_to_reload='config_mach';
+	}
+	if ($protectedPost['onglet'] == 'MACH')
+	$nb_affect=active_mach($list_id,$protectedPost['SELECT']);
+	if ($protectedPost['onglet'] == 'SERV_GROUP')
+	$nb_affect=active_serv($list_id,$protectedPost['SELECT'],$protectedPost['rule_choise']);
+	msg_success($nb_affect." ".$l->g(604));
+	if (isset($form_to_reload))
+	echo "<script language='javascript'> window.opener.document.".$form_to_reload.".submit();</script>";
+}
+if ($protectedPost['sens'] == "")
+	$protectedPost['sens']='DESC';
+
+
+if ($protectedPost['onglet'] == "")
+$protectedPost['onglet'] = 'MACH';
+
+
+$def_onglets['MACH']=$l->g(980); //DYNAMICS GROUPS
+$def_onglets['SERV_GROUP']=$l->g(981); //STATICS GROUPS
+
+//show tab
+if ($list_id){	
+	onglet($def_onglets,$form_name,'onglet',7);
+	echo "<table ALIGN = 'Center' class='onglet'><tr><td align =center><tr><td align =center>";
+	if ($protectedPost['onglet'] == 'SERV_GROUP'){
+		$sql_rules="select distinct rule,rule_name from download_affect_rules order by 1";
+			$res_rules = mysql_query( $sql_rules, $_SESSION['OCS']["readServer"] ) or die(mysql_error($_SESSION['OCS']["readServer"]));
+			$nb_rule=0;
+			while( $val_rules = mysql_fetch_array($res_rules)) {
+				$first=$val_rules['rule'];
+				$list_rules[$val_rules['rule']]=$val_rules['rule_name'];
+				$nb_rule++;
+			}
+		if ($nb_rule>1){
+		$select_choise=$l->g(668).show_modif($list_rules,'rule_choise',2,$form_name);	
+		echo $select_choise;
+		}elseif($nb_rule == 1){
+			$protectedPost['rule_choise']=$first;
+			echo "<input type=hidden value='".$first."' name='rule_choise' id='rule_choise'>";
+		}elseif ($nb_rule == 0){
+			msg_error($l->g(982));
+		}
+	}
+	
+	if(($protectedPost['onglet'] == 'MACH') 
+		or ($protectedPost['onglet'] == 'SERV_GROUP' and $protectedPost['rule_choise'] != '')){
+			//recherche de toutes les r�gles pour les serveurs de redistribution
+		$list_fields= array('FILE_ID'=>'e.FILEID',
 								'INFO_LOC'=>'e.INFO_LOC',
 								'CERT_FILE'=>'e.CERT_FILE',
 								'CERT_PATH'=>'e.CERT_PATH',
 								//'PACK_LOC'=>'de.PACK_LOC',
-								'PACK_NAME'=>'a.NAME',
-								'PRIORITY'=>'a.PRIORITY',
-								'COMMENT'=>'a.COMMENT',
-								'OS_NAME'=>'a.OSNAME',
-								'SIZE'=>'a.SIZE'				
+								$l->g(1037)=>'a.NAME',
+								$l->g(1039)=>'a.PRIORITY',
+								$l->g(51)=>'a.COMMENT',
+								$l->g(274)=>'a.OSNAME',
+								$l->g(953)." (KB)"=>'a.SIZE'
 								);
-												
-		if (!isset($nb_rule) or $nb_rule>0)	{
-		if ($protectedPost['onglet'] != 'SERV_GROUP'){
-			$list_fields['PACK_LOC']='e.PACK_LOC';	
-			$list_fields['ACTIVE_ID']='e.ID';
-			$list_fields['SELECT']='e.ID';
-		}else{
-			$list_fields['ACTIVE_ID']='e.FILEID';
-			$list_fields['SELECT']='e.FILEID';
-		}
-	}		$table_name="LIST_PACK_SEARCH";//INSERT INTO devices(HARDWARE_ID, NAME, IVALUE) VALUES('".$val["h.id"]."', 'DOWNLOAD', $packid)
-		$default_fields= array('PACK_NAME'=>'PACK_NAME','PRIORITY'=>'PRIORITY','OS_NAME'=>'OS_NAME','SIZE'=>'SIZE','SELECT'=>'SELECT');
-		$list_col_cant_del=array('PACK_NAME'=>'PACK_NAME','SELECT'=>'SELECT');
-
-		if ($protectedPost['onglet'] != 'SERV_GROUP'){
-			$default_fields['PACK_LOC']='PACK_LOC';
-			$list_col_cant_del['PACK_LOC']='PACK_LOC';
-		}
-
-		$querypack = 'SELECT  ';
-		if ($protectedPost['onglet'] == 'SERV_GROUP')
-			$querypack .= ' distinct ';
-		foreach ($list_fields as $key=>$value){
-			if($key != 'SELECT')
-			$querypack .= $value.',';		
-		} 
-		$querypack=substr($querypack,0,-1);
-		$querypack .= " from download_available a, download_enable e ";
-		if ($protectedPost['onglet'] == 'MACH')
-		$querypack .= "where a.FILEID=e.FILEID and e.SERVER_ID is null ";
-		else
-		$querypack .= ", hardware h where a.FILEID=e.FILEID and h.id=e.group_id and  e.SERVER_ID is not null ";
-		$tab_options['QUESTION']['SELECT']=$l->g(699);
-		$tab_options['FILTRE']=array('e.FILEID'=>'Timestamp','a.NAME'=>$l->g(49));
 		
-		$result_exist=tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$querypack,$form_name,100,$tab_options); 
+		if (!isset($nb_rule) or $nb_rule>0)	{
+		if ($protectedPost['onglet'] != 'SERV_GROUP'){
+			$list_fields['PACK_LOC']='e.PACK_LOC';	
+			$list_fields['ACTIVE_ID']='e.ID';
+			$list_fields['SELECT']='e.ID';
+		}else{
+			$list_fields['ACTIVE_ID']='e.FILEID';
+			$list_fields['SELECT']='e.FILEID';
+		}
+	}		$table_name="LIST_PACK_SEARCH";//INSERT INTO devices(HARDWARE_ID, NAME, IVALUE) VALUES('".$val["h.id"]."', 'DOWNLOAD', $packid)
+		$default_fields= array('PACK_NAME'=>'PACK_NAME','PRIORITY'=>'PRIORITY','OS_NAME'=>'OS_NAME','SIZE'=>'SIZE','SELECT'=>'SELECT');
+		$list_col_cant_del=array('PACK_NAME'=>'PACK_NAME','SELECT'=>'SELECT');
+
+		if ($protectedPost['onglet'] != 'SERV_GROUP'){
+			$default_fields['PACK_LOC']='PACK_LOC';
+			$list_col_cant_del['PACK_LOC']='PACK_LOC';
+		}
+
+		$querypack = 'SELECT  ';
+		if ($protectedPost['onglet'] == 'SERV_GROUP')
+			$querypack .= ' distinct ';
+		foreach ($list_fields as $key=>$value){
+			if($key != 'SELECT')
+			$querypack .= $value.',';		
+		} 
+		$querypack=substr($querypack,0,-1);
+		$querypack .= " from download_available a, download_enable e ";
+		if ($protectedPost['onglet'] == 'MACH')
+		$querypack .= "where a.FILEID=e.FILEID and e.SERVER_ID is null ";
+		else
+		$querypack .= ", hardware h where a.FILEID=e.FILEID and h.id=e.group_id and  e.SERVER_ID is not null ";
+		$tab_options['QUESTION']['SELECT']=$l->g(699);
+		$tab_options['FILTRE']=array('e.FILEID'=>'Timestamp','a.NAME'=>$l->g(49));
+		
+		$result_exist=tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$querypack,$form_name,100,$tab_options); 
 	}
 	echo "</td></tr></table>";
 }

=== modified file 'plugins/main_sections/ms_teledeploy/ms_tele_popup_active.php'
--- plugins/main_sections/ms_teledeploy/ms_tele_popup_active.php	2010-12-14 13:24:50 +0000
+++ plugins/main_sections/ms_teledeploy/ms_tele_popup_active.php	2011-01-02 18:01:25 +0000
@@ -66,7 +66,7 @@
 			fclose( $fragOk );	
 		
 		if (! $fragOk or ! $httpsOk){
-			$error .= "<br>".$l->g(468)."<br>";
+			$error .= "<br>".$l->g(468)."<br><br>";
 			$error .= "<input type='submit' name='YES' value='".$l->g(455)."'>&nbsp&nbsp&nbsp<input type='submit' name='NO' value='".$l->g(454)."'>";
 		}
 		if ($error != '')