--- pmb-3.0.26.orig/pmb/admin/empr/import_empr.inc.php
+++ pmb-3.0.26/pmb/admin/empr/import_empr.inc.php
@@ -89,6 +89,32 @@
 	<div class='colonne2'>
 		<label class='etiquette' for='form_import_lec'>". $msg["import_lec_Cat"]."</label>
 		<select name='selectGroupe'>";
+	
+
+/*		if ($from_ldap){
+                        $fichero_lec = "./temp/ldap_users.txt";
+                        $Sep_Champs='|';
+                        $fichero = fopen( $fichero_lec, "r" );
+                        if($fichero)     {
+				$buffer = fread ( $fichero, filesize ($fichero_lec));
+                                if (preg_match('/\r\n/',$buffer)){
+                                        //txt msdos
+                                        $bufferLine = explode("\r\n", $buffer);
+                                }else{
+                                        //txt linux
+                                        $bufferLine = explode("\n", $buffer);
+                                }
+
+                                while(end($bufferLine) == "")
+                                        array_pop($bufferLine);
+				foreach($bufferLine as $tmp){
+                                        $bufferChamp = explode ($Sep_Champs, $tmp);
+                                        $i = count($bufferChamp);
+                                        }
+			}
+		} */
+
+
 while($row = mysql_fetch_row($result)) // pour remplir la listBox
 	print "<option value='".
 				htmlentities($row[0],ENT_QUOTES, $charset)."'>".
@@ -189,7 +215,7 @@
 //					$val_buff2 = $buffer[ $ordre[$k] ];
 //					print "<td class='nobrd'><input name='exem$k' value='$val_buff, $val_buff2' type='text' disabled size='40'></td>";
 
-					print "<td class='nobrd'><input name='exem$k' value='$val_buff' type='text' disabled size='40'></td>";
+					print "<td class='nobrd'><input name='exem$k' value='".utf8_decode($val_buff)."' type='text' disabled size='40'></td>";
 				}
 				// pas r?ussi a le faire fonctionn? comme du monde!! pas le temp
 
@@ -204,13 +230,13 @@
 				{
 					print "<td class='nobrd'><font color='#FF0000'>$row[0]</font></td>";
 					print "<td class='nobrd'><center><input name='".$row[0]."' value='".$ordre[$k]."' type='text' size='1' disabled></center></td>";
-					print "<td class='nobrd'><input name='exem$k' value='$val_buff' type='text' disabled size='40'></td>";
+					print "<td class='nobrd'><input name='exem$k' value='".utf8_decode($val_buff)."' type='text' disabled size='40'></td>";
 				}
 				else
 				{
 					print "<td class='nobrd'>$row[0]</td>";
 					print "<td class='nobrd'><center><input name='".$row[0]."' value='".$ordre[$k]."' type='text' size='1'></center></td>";
-					print "<td class='nobrd'><input name='exem$k' value='$val_buff' type='text' disabled size='40'></td>";
+					print "<td class='nobrd'><input name='exem$k' value='".utf8_decode($val_buff)."' type='text' disabled size='40'></td>";
 				}
 				print "</tr>";
 				$k++;
@@ -231,7 +257,7 @@
 			$val_buff = $buffer[ $ordre[$k] ];
 			print "<td class='nobrd'>".$row['name']."</td>";
 			print "<td class='nobrd'><center><input name='".$row['name']."' value='".$ordre[$k]."' type='text' size='1'></center></td>";
-			print "<td class='nobrd'><input name='exem$k' value='$val_buff' type='text' disabled size='40'></td>";
+			print "<td class='nobrd'><input name='exem$k' value='".utf8_decode($val_buff)."' type='text' disabled size='40'></td>";
 		}
 		print "</tr>";
 		$k++;
@@ -498,6 +524,7 @@
 			}else{
 				$file_lec = "./temp/$import_lec";
 			}
+			
 			$ficher = fopen( $file_lec, "r" );
 			if($ficher)	{
 	
@@ -550,6 +577,7 @@
 				foreach($bufferLine as $dummykey=>$tmp){
 					$bufferChamp = explode ($Sep_Champs, $tmp);
 					$cpt = count($bufferChamp) - 1;
+					$municipio = count($bufferChamp);
 					// de 1 ? la fin, le 0 est comme null!
 					for($j=$cpt; $j>=0; $j--){
 						// el?ve les " et les espaces en debut et fin du string(pour chaque champ!)
@@ -617,6 +645,7 @@
 								}
 							}
 						}
+						$values=utf8_decode($values);
 						$query = "insert into empr ($fields) values ($values);";
 						//print $query;
 						$res = mysql_query($query, $dbh) or print $msg["ins_echoue"]."<p>".$query."<hr>";
@@ -629,9 +658,19 @@
 						$res = mysql_query($query2, $dbh) or print $msg["upd_echoue"]."<p>".$query2."<hr>";
 						$query2 = 'update empr set empr_date_expiration = "'.aujourdhui($dur).'" where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
 						$res = mysql_query($query2, $dbh) or print $msg["upd_echoue"]."<p>".$query2."<hr>";
+						// $query2 = 'update empr set empr_categ = '.$_POST[selectGroupe].' where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
+						if($from_ldap) {
+						$query2 = 'update empr set empr_categ = '.$bufferChamp[$cpt].' where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
+						} else {
 						$query2 = 'update empr set empr_categ = '.$_POST[selectGroupe].' where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
+						}
 						$res = mysql_query($query2, $dbh) or print $msg["upd_echoue"]."<p>".$query2."<hr>";
+						// $query2 = 'update empr set empr_codestat = '.$_POST[selectStat].' where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
+						if($from_ldap) {
+						$query2 = 'update empr set empr_codestat = '.$bufferChamp[$municipio].' where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
+						} else {
 						$query2 = 'update empr set empr_codestat = '.$_POST[selectStat].' where empr_cb = "'.$bufferChamp[$$desc_empr[1][0]].'";';
+						}
 						$res = mysql_query($query2, $dbh) or print $msg["upd_echoue"]."<p>".$query2."<hr>";
 						if ($from_ldap){
 							$query2 = "update empr set empr_ldap = '1' where empr_cb = '".$bufferChamp[$$desc_empr[1][0]]."';";
--- pmb-3.0.26.orig/pmb/admin/empr/import_ldap.inc.php
+++ pmb-3.0.26/pmb/admin/empr/import_ldap.inc.php
@@ -2,7 +2,7 @@
 // +-------------------------------------------------+
 // ? 2002-2004 PMB Services / www.sigb.net pmb@sigb.net et contributeurs (voir www.sigb.net)
 // +-------------------------------------------------+
-// $Id: import_ldap.inc.php,v 1.9.2.1 2007/06/11 14:30:50 touraine37 Exp $
+// $Id: import_ldap.inc.php,v 1.9 2007/03/10 08:32:24 touraine37 Exp $
 
 if (stristr($_SERVER['REQUEST_URI'], ".inc.php")) die("no access");
 
@@ -41,7 +41,6 @@
     # postalcode = cap
     # postaladdress = address
     # homephone = tel 
-	
 
 #	printr ($info);
 #	print "infocount=".$info['count']."\n";
@@ -51,9 +50,15 @@
 	for($k = 0; $k<$info["count"]; $k++)  {
 
 		#print "fieldcount=".count($fields)."<br>";
+		
+		if ( !( (ereg("alumn",$info[$k]["dn"]))||(ereg("profs",$info[$k]["dn"])) ) ) {
+			
+			$info[$k]="";
 
+		}
+		
 		for($j = 0; $j<count($fields) ; $j++) {
-			
+			if ($info[$k]!="") {
 				$v=rtrim($info[$k][strtolower($fields[$j])][0],',');
 
 #				$y=strtolower($fields[$j]);
@@ -67,9 +72,12 @@
 					$v=ucwords(strtolower($v));
 					$cn=explode(' ',$v);
 					$c=$n="";
-					for ($i=0;$i<count($cn)-1;$i++){$c .= $cn[$i];}
-					$n=$cn[count($cn)-1];
-					$ret .= "$c|$n|";
+					//for ($i=0;$i<count($cn)-1;$i++){$c .= $cn[$i]." ";}
+					for ($i=0;$i<count($cn)-1;$i++){$c .= $cn[$i]." ";} $c =$c.$cn[count($cn)-1];
+					$n=$cn[count($cn)-1]; 
+					//$ret .= "$c|$n|"; 
+					$ret .= "$c|"; 
+					//$ret .= $cn[0]." ".$cn[1]."|".$cn[2]."|";
 
 				}elseif ($fields[$j]=="sn"){
 
@@ -94,12 +102,23 @@
 				}else{
 					$ret .= "$v|";
 				}
+			}
 		}
 		$ret = rtrim($ret,'|');
-		$ret .= ";";
+		if ($info[$k]!="") { 
+			if (ereg("alumn",$info[$k]["dn"])) {
+				$ret .= "|5";
+				$ret .= "|3";
+			}
+			if (ereg("profs",$info[$k]["dn"])) {
+				$ret .= "|3";
+				$ret .= "|3";
+			}
+			$ret .= ";"; 
+		}
 	}
     $fp=fopen("./temp/ldap_users.txt","w");
-    fwrite($fp,$ret);
+    fwrite($fp,quoted_printable_decode(utf8_decode($ret)));
     fclose($fp);
 	return $ret;
 }
@@ -175,6 +194,13 @@
 
 	$auu=explode(';',$uu);
 	$nuu=count($auu);
+	if ($_POST['todos']) {
+		$npp=$nuu;
+		$check_box="checked";
+	}
+	else {
+	$check_box="";
+	}
 	if (!$npp) $npp=10;
 	$npag = ceil($nuu/$npp);
 	$nextp = $pag+1;
@@ -213,13 +239,13 @@
 		if ($cc[0]){
 			$usr_entry="
 				<td valign='top'>
-					<input type='checkbox' id='id_to_del$r' name='usrdel[]' value='$cc[0]'/>
+					<input type='checkbox' id='id_to_del$r' name='usrdel[]' value='$cc[0]' $check_box/>
 				</td>
 				<td valign='top'>
 					$cc[0]
 				</td>";
-		for ($j=2;$j<count($cc);$j++){
-				$usr_entry .= "<td valign='top'>$cc[$j]</td>";
+		for ($j=2;$j<count($cc)-1;$j++){
+				$usr_entry .= "<td valign='top'>".quoted_printable_decode(utf8_decode($cc[$j]))."</td>";
 		}
 
 		if ($k % 2) {
@@ -231,7 +257,7 @@
 		$tr_javascript=" onmouseover=\"this.className='surbrillance'\" onmouseout=\"this.className='$pair_impair'\" onmousedown=\"setCheckboxColumn('id_to_del$r')\" ";
 
 		$usr_list .= "<tr class='$pair_impair' $tr_javascript style='cursor: pointer'>
-										<td valign='top'>$usr_entry</td>
+										<td valign='top'>".quoted_printable_decode(utf8_decode($usr_entry))."</td>
 							</tr>";
 		}
 
@@ -312,11 +338,30 @@
 					show_users_ldap($uu,$pag,$npp);
 					break;
 				case $msg[import_ldap_exe]:
+					$xx=$_POST['usrdel'];
 					$uu=$_POST['uu'];
+					$vecuu=explode(";",$uu);
+					$mismisimos="";
+					foreach ($xx as $x){
+						// $u="/$x"."[^;]+;/";
+						// $uu=preg_replace($u,'',$uu,1);
+						for ($i=0;$i<count($vecuu);$i++) {
+							$pos=strpos($vecuu[$i],$x);
+							if ($pos === false) {
+								}
+							else {
+								$mismisimos=$mismisimos.$vecuu[$i].";";
+								break;
+							}
+						}
+						// $mismisimos=$mismisimos.$u;
+					}
+					// $uu=$_POST['uu'];
+					$uu=$mismisimos;
 					$uu=str_replace(';',"\n",$uu);
 #					$uu=str_replace('|',',',$uu);
 					$fp=fopen("./temp/ldap_users.txt","w");
-					fwrite($fp,$uu);
+					fwrite($fp,quoted_printable_decode(utf8_decode($uu)));
 					fclose($fp);
 					$action="";
 					$from_ldap='1';
--- pmb-3.0.26.orig/pmb/includes/templates/ldap_users.tpl.php
+++ pmb-3.0.26/pmb/includes/templates/ldap_users.tpl.php
@@ -43,6 +43,7 @@
 		}
 	}
 }
+
 //-->
 </script>
 <form class='form-$current_module' name='form1' method='post' action=\"./admin.php?categ=empr&sub=ldap&action=ldapOK\">
@@ -66,7 +67,10 @@
 		<th></th>
 		<th></th>
 		<th></th>
+		<th><input type=\"submit\" class=\"bouton\" name=\"todos\" value=\"Seleccionar todos los usuarios del LDAP\"></th>
+		<table>
 		!!usr_list!!
+		</table>
 	</table>
 </div>
 <div class='row'>
@@ -82,8 +86,8 @@
 		<input type='submit' class='bouton' name='btsubmit' value='$msg[import_ldap_exe]' />
 	</td>
 	<td class='td-rbut'>
-		<input type='submit' class='bouton' name='btsubmit' value='$msg[del_ldap_usr]' />
-	</td>
+		<input type='submit' class='bouton' name='btsubmit' value='$msg[del_ldap_usr]' /> 
+	</td> 
 	</tr></table>
 </div>
 <br>
--- pmb-3.0.26.orig/pmb32x32.xpm
+++ pmb-3.0.26/pmb32x32.xpm
@@ -0,0 +1,210 @@
+/* XPM */
+static char * pmb_xpm[] = {
+"24 24 183 2",
+"  	c None",
+". 	c #FEFEFE",
+"+ 	c #FDFDFE",
+"@ 	c #AAB1D4",
+"# 	c #414FA0",
+"$ 	c #F0F1F7",
+"% 	c #C5CAE2",
+"& 	c #2B3B95",
+"* 	c #37469B",
+"= 	c #FCFCFD",
+"- 	c #5F6BAF",
+"; 	c #293994",
+"> 	c #F1F2F7",
+", 	c #39479C",
+"' 	c #F8F9FB",
+") 	c #A3AAD1",
+"! 	c #606BAF",
+"~ 	c #939BC8",
+"{ 	c #F2F3F8",
+"] 	c #E0E2EF",
+"^ 	c #5864AB",
+"/ 	c #5662AA",
+"( 	c #5E69AE",
+"_ 	c #E2E4F0",
+": 	c #37459B",
+"< 	c #2F3E97",
+"[ 	c #5D69AD",
+"} 	c #959DCA",
+"| 	c #EFF1F7",
+"1 	c #F7F7FA",
+"2 	c #6C78B6",
+"3 	c #293894",
+"4 	c #4E5CA6",
+"5 	c #F0F2F7",
+"6 	c #D8DBEB",
+"7 	c #2D3D96",
+"8 	c #2D3C96",
+"9 	c #636EB1",
+"0 	c #ECEDF5",
+"a 	c #505CA7",
+"b 	c #EDEEF6",
+"c 	c #A7AED3",
+"d 	c #848DC1",
+"e 	c #E9EBF3",
+"f 	c #8992C3",
+"g 	c #8791C3",
+"h 	c #8792C3",
+"i 	c #9FA7CF",
+"j 	c #38469B",
+"k 	c #2E3D97",
+"l 	c #CACDE4",
+"m 	c #304098",
+"n 	c #505DA7",
+"o 	c #868FC2",
+"p 	c #4E5BA6",
+"q 	c #525FA8",
+"r 	c #BFC4DF",
+"s 	c #4D5AA6",
+"t 	c #3C4A9D",
+"u 	c #757FBA",
+"v 	c #929AC8",
+"w 	c #C8CCE3",
+"x 	c #C8CDE3",
+"y 	c #F5F5F9",
+"z 	c #818AC0",
+"A 	c #AAB0D4",
+"B 	c #2B3A95",
+"C 	c #9DA4CD",
+"D 	c #F3F4F8",
+"E 	c #8089BF",
+"F 	c #3A499D",
+"G 	c #2C3C96",
+"H 	c #CCD0E5",
+"I 	c #BABFDC",
+"J 	c #2A3A95",
+"K 	c #BFC4DE",
+"L 	c #7782BB",
+"M 	c #7E87BE",
+"N 	c #8C94C5",
+"O 	c #D0D4E7",
+"P 	c #8A93C4",
+"Q 	c #283893",
+"R 	c #A8AED3",
+"S 	c #3E4C9E",
+"T 	c #E0E3EF",
+"U 	c #2F3F97",
+"V 	c #4653A2",
+"W 	c #3A499C",
+"X 	c #2A3A94",
+"Y 	c #BDC2DD",
+"Z 	c #7681BB",
+"` 	c #7580BB",
+" .	c #7883BC",
+"..	c #808AC0",
+"+.	c #4654A2",
+"@.	c #B9BEDC",
+"#.	c #4C59A5",
+"$.	c #3B4A9D",
+"%.	c #4F5BA6",
+"&.	c #F5F6F9",
+"*.	c #3F4D9F",
+"=.	c #B0B6D7",
+"-.	c #2E3E96",
+";.	c #2C3C95",
+">.	c #2C3B95",
+",.	c #4957A4",
+"'.	c #E8EAF3",
+").	c #3D4B9E",
+"!.	c #4F5CA7",
+"~.	c #F5F6FA",
+"{.	c #2A3994",
+"].	c #AFB5D7",
+"^.	c #3D4C9E",
+"/.	c #AFB5D6",
+"(.	c #A2A9D0",
+"_.	c #293A94",
+":.	c #2A3B94",
+"<.	c #DFE1EE",
+"[.	c #FBFBFD",
+"}.	c #F4F5F9",
+"|.	c #3F4D9E",
+"1.	c #C0C5DF",
+"2.	c #8993C4",
+"3.	c #9199C7",
+"4.	c #919AC7",
+"5.	c #929BC8",
+"6.	c #DDDFED",
+"7.	c #5663AA",
+"8.	c #B6BBDA",
+"9.	c #4553A2",
+"0.	c #F9F9FC",
+"a.	c #E9EBF4",
+"b.	c #344399",
+"c.	c #36459A",
+"d.	c #E9EAF3",
+"e.	c #314198",
+"f.	c #B7BCDA",
+"g.	c #4856A3",
+"h.	c #CACEE4",
+"i.	c #EDEEF5",
+"j.	c #9098C7",
+"k.	c #A8AFD3",
+"l.	c #C4C8E1",
+"m.	c #B2B8D8",
+"n.	c #8D96C6",
+"o.	c #7F89BF",
+"p.	c #7781BB",
+"q.	c #B1B7D8",
+"r.	c #D1D5E8",
+"s.	c #FAFBFC",
+"t.	c #B4B9D9",
+"u.	c #5561AA",
+"v.	c #4B59A5",
+"w.	c #989FCB",
+"x.	c #404E9F",
+"y.	c #4351A1",
+"z.	c #8891C3",
+"A.	c #E3E6F1",
+"B.	c #6D77B6",
+"C.	c #6B76B5",
+"D.	c #6B75B5",
+"E.	c #6A75B5",
+"F.	c #6F78B6",
+"G.	c #858EC2",
+"H.	c #314098",
+"I.	c #A4ABD1",
+"J.	c #5562AA",
+"K.	c #616DB0",
+"L.	c #FBFBFC",
+"M.	c #6F7AB6",
+"N.	c #949BC9",
+"O.	c #ABB0D4",
+"P.	c #F9F9FB",
+"Q.	c #EBECF5",
+"R.	c #959CC9",
+"S.	c #939BC9",
+"T.	c #949CC9",
+"U.	c #E6E8F2",
+"V.	c #B8BDDB",
+"W.	c #324299",
+"X.	c #6E79B6",
+"Y.	c #D0D3E7",
+"Z.	c #5E6AAE",
+". . . . . . . . . . . . . . . . . + @ # $ . . . ",
+". . . . . . . . . . . . . . . . . % & * $ . . . ",
+". . . . . . . . . . . . . . . . = - ; * $ . . . ",
+". . . . . . . . . . . . . . . . > , ; * $ . . . ",
+". ' ) ! ~ { . ] ^ / / / / / ( _ $ : ; < [ } | . ",
+"1 2 3 ; 3 4 5 6 < 7 8 7 7 & ; 9 0 : ; ; ; ; a b ",
+"c ; ; ; ; ; d e f g h g h i j k l * ; m n 8 3 o ",
+"p ; q r s ; t 6 u v w x x y z ; A * B C D E ; F ",
+"; G H . I J & K L M N O D + P Q R * S { . T U 3 ",
+"; V 1 . > W X Y L Z `  ...H +.J @.* #.. . { $.; ",
+"; %.= . &.*.X =.-.;.>.G >.J ; ,.'.* #.. . { ).; ",
+"; !.= . ~.*.{.].& ; ; ; ; ; 3 =.$ * #.. . D ^.; ",
+"; p = . ~.*.{./.& ; ; ; ; ; ; (.$ * #.. . D ).; ",
+"; !.= . &.*._./.& :.; X _.& ; t <.* #.. . { ).; ",
+"; p [.. }.|.{.1.f 2.3.4.5.6.7.X 8.* 9.0.. a.b.; ",
+"; c.d.. ] e.B f.g.L h.i.. . j.; k.* 7 l.. m.; ; ",
+"; ; n.'.o.; *.6 p.Z p.q.r.s.p.; t.u.; v.w.x.; x.",
+"; ; 8 y.;.; z.A.B.C.D.E.F.G.H.< 6 8.& ; ; ; J I.",
+"; ; ; ; ; J.{ 6 B ; ; ; ; ; ; K.L.s.d Q ; 3 M.1 ",
+"; ; ; N.O.P.. Q.R.S.T.S.T.T.S.U.. . = V.S.8.0.. ",
+"W.; ; . . . . . . . . . . . . . . . . . . . . . ",
+"X.; 3 . . . . . . . . . . . . . . . . . . . . . ",
+"Y.c.; . . . . . . . . . . . . . . . . . . . . . ",
+"+ V.Z.. . . . . . . . . . . . . . . . . . . . . "};