From: x2000habouzit <x2000habouzit>
Date: Tue, 31 Aug 2004 19:18:26 +0000 (+0000)
Subject: last tab.
X-Git-Tag: xorg/old~1651
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=aa4db9033685d843f022ee413b73b4991575b934;p=platal.git

last tab.
still a lot to correct : a smarty function should NEVER do any echo .....
please RTFM !
---

diff --git a/include/fonction.emploi.inc.php b/include/fonction.emploi.inc.php
index b712f25..32e1f0a 100644
--- a/include/fonction.emploi.inc.php
+++ b/include/fonction.emploi.inc.php
@@ -18,24 +18,27 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fonction.emploi.inc.php,v 1.4 2004-08-31 13:59:43 x2000habouzit Exp $
+        $Id: fonction.emploi.inc.php,v 1.5 2004-08-31 19:18:26 x2000habouzit Exp $
  ***************************************************************************/
 
-
 function select_fonction($fonction){
-	echo "<option value=\"\" ". (($fonction == '0')?"selected='selected'":"") .">&nbsp;</option>\n";
-        $res = $globals->db->query("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) from fonctions_def ORDER BY id");
-	while(list($fid, $flabel, $ftitre) = mysql_fetch_row($res)){
-		if($ftitre)
-			echo "<option value=\"$fid\" " . (($fonction == $fid)?"selected='selected'":"") . ">$flabel</option>\n";
-		else
-			echo "<option value=\"$fid\" " . (($fonction == $fid)?"selected='selected'":"") . ">* $flabel</option>\n";
-	}
-	mysql_free_result($res);
+    global $globals;
+    $html = "<option value='' ". (($fonction == '0')?"selected='selected'":"") .">&nbsp;</option>\n";
+
+    $res = $globals->db->query("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) from fonctions_def ORDER BY id");
+    while(list($fid, $flabel, $ftitre) = mysql_fetch_row($res)){
+	if($ftitre)
+	    $html.= "<option value='$fid' " . (($fonction == $fid)?"selected='selected'":"") . ">$flabel</option>\n";
+	else
+	    $html .= "<option value=\"$fid\" " . (($fonction == $fid)?"selected='selected'":"") . ">* $flabel</option>\n";
+    }
+    mysql_free_result($res);
+    return $html;
 }
 
 function _select_fonction_smarty($params){
-  select_fonction($params['fonction']);
+    return select_fonction($params['fonction']);
 }
+
 $page->register_function('select_fonction', '_select_fonction_smarty');
 ?>
diff --git a/include/profil/assign_emploi.inc.php b/include/profil/assign_emploi.inc.php
new file mode 100644
index 0000000..8f7fd6a
--- /dev/null
+++ b/include/profil/assign_emploi.inc.php
@@ -0,0 +1,47 @@
+<?php
+/***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************
+        $Id: assign_emploi.inc.php,v 1.1 2004-08-31 19:18:26 x2000habouzit Exp $
+ ***************************************************************************/
+
+$page->assign('endrid',$endrid);
+$page->assign('entreprise',$entreprise);
+$page->assign('secteur',$secteur);
+$page->assign('ss_secteur',$ss_secteur);
+$page->assign('poste',$poste);
+$page->assign('fonction',$fonction);
+$page->assign('adrpro1',$adrpro1);
+$page->assign('adrpro2',$adrpro2);
+$page->assign('adrpro3',$adrpro3);
+$page->assign('cppro',$cppro);
+$page->assign('villepro',$villepro);
+$page->assign('payspro',$payspro);
+$page->assign('regionpro',$regionpro);
+$page->assign('telpro',$telpro);
+$page->assign('faxpro',$faxpro);
+$page->assign('entreprise_public',$entreprise_public);
+$page->assign('entreprise_ax',$entreprise_ax);
+$page->assign('adrpro_public',$adrpro_public);
+$page->assign('adrpro_ax',$adrpro_ax);
+$page->assign('telpro_public',$telpro_public);
+$page->assign('telpro_ax',$telpro_ax);
+$page->assign('cv',$cv);
+
+?>
diff --git a/include/profil/profil_emploi.inc.php b/include/profil/get_emploi.inc.php
similarity index 74%
rename from include/profil/profil_emploi.inc.php
rename to include/profil/get_emploi.inc.php
index 4563d5d..a7a0b67 100644
--- a/include/profil/profil_emploi.inc.php
+++ b/include/profil/get_emploi.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: profil_emploi.inc.php,v 1.4 2004-08-31 13:59:43 x2000habouzit Exp $
+        $Id: get_emploi.inc.php,v 1.1 2004-08-31 19:18:26 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once('geoloc.inc.php');
@@ -31,7 +31,7 @@ $res = $globals->db->query("SELECT entrid, entreprise, secteur, ss_secteur, post
 	FIND_IN_SET('adr_ax',visibilite),FIND_IN_SET('tel_public',visibilite),FIND_IN_SET('tel_ax',visibilite)
         FROM entreprises
         WHERE uid = '{$_SESSION['uid']}' ORDER BY entrid");
-//echo mysql_error();
+
 $nb_res = mysql_num_rows($res);
 for($i = 0; $i < $nb_res ; $i++){
 	list($endrid[$i], $entreprise[$i], $secteur[$i], $ss_secteur[$i], $poste[$i], $fonction[$i],
@@ -64,47 +64,24 @@ for($i = $nb_res; $i < 2 ; $i++){
 	$telpro_ax[$i] = '';
 }
 
-$page->assign_by_ref('endrid',$endrid);
-$page->assign_by_ref('entreprise',$entreprise);
-$page->assign_by_ref('secteur',$secteur);
-$page->assign_by_ref('ss_secteur',$ss_secteur);
-$page->assign_by_ref('poste',$poste);
-$page->assign_by_ref('fonction',$fonction);
-$page->assign_by_ref('adrpro1',$adrpro1);
-$page->assign_by_ref('adrpro2',$adrpro2);
-$page->assign_by_ref('adrpro3',$adrpro3);
-$page->assign_by_ref('cppro',$cppro);
-$page->assign_by_ref('villepro',$villepro);
-$page->assign_by_ref('payspro',$payspro);
-$page->assign_by_ref('regionpro',$regionpro);
-$page->assign_by_ref('telpro',$telpro);
-$page->assign_by_ref('faxpro',$faxpro);
-$page->assign_by_ref('entreprise_public',$entreprise_public);
-$page->assign_by_ref('entreprise_ax',$entreprise_ax);
-$page->assign_by_ref('adrpro_public',$adrpro_public);
-$page->assign_by_ref('adrpro_ax',$adrpro_ax);
-$page->assign_by_ref('telpro_public',$telpro_public);
-$page->assign_by_ref('telpro_ax',$telpro_ax);
-
 //recuperation des donnees sur les secteurs :
 
 $res = $globals->db->query("SELECT id, label from emploi_secteur");
 
 while(list($tmp_secteur_id, $tmp_secteur_label) = mysql_fetch_row($res)){
-	$secteurs[$tmp_secteur_id] = $tmp_secteur_label;
+    $secteurs[$tmp_secteur_id] = $tmp_secteur_label;
 }
 
 //recuperation des donnees sur les fonctions :
 $res = $globals->db->query("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) from fonctions_def ORDER BY id");
 
 while(list($tmp_fonction_id, $tmp_fonction_label, $tmp_fonction_titre) = mysql_fetch_row($res)){
-	$fonctions[$tmp_fonction_id] = $tmp_fonction_label;
-	$fonctions_titre[$tmp_fonction_id] = $tmp_fonction_titre;
+    $fonctions[$tmp_fonction_id] = $tmp_fonction_label;
+    $fonctions_titre[$tmp_fonction_id] = $tmp_fonction_titre;
 }
 
 //recuperation du CV
 $res = $globals->db->query("SELECT cv from auth_user_md5 where user_id = '{$_SESSION['uid']}'");
 list($cv) = mysql_fetch_row($res);
-$page->assign_by_ref('cv',$cv);
 
 ?>
diff --git a/include/profil/update_emploi.inc.php b/include/profil/update_emploi.inc.php
index 5ad7fc3..8330695 100644
--- a/include/profil/update_emploi.inc.php
+++ b/include/profil/update_emploi.inc.php
@@ -18,28 +18,27 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: update_emploi.inc.php,v 1.3 2004-08-31 13:59:43 x2000habouzit Exp $
+        $Id: update_emploi.inc.php,v 1.4 2004-08-31 19:18:26 x2000habouzit Exp $
  ***************************************************************************/
 
 for($i = 0; $i < 2; $i++){
-  
- $visibilite = "";
- if (! empty($_REQUEST["entreprise_public"][$i])) $visibilite .= 'entreprise_public,';
- if (! empty($_REQUEST["entreprise_ax"][$i])) $visibilite .= 'entreprise_ax,';
- if (! empty($_REQUEST["adrpro_public"][$i])) $visibilite .= 'adr_public,';
- if (! empty($_REQUEST["adrpro_ax"][$i]))     $visibilite .= 'adr_ax,';
- if (! empty($_REQUEST["telpro_public"][$i])) $visibilite .= 'tel_public,';
- if (! empty($_REQUEST["telpro_ax"][$i]))     $visibilite .= 'tel_ax,';
- if (! empty($visibilite)) $visibilite = substr($visibilite, 0, -1);
+    $visibilite = "";
+    if (! empty($_REQUEST["entreprise_public"][$i])) $visibilite .= 'entreprise_public,';
+    if (! empty($_REQUEST["entreprise_ax"][$i])) $visibilite .= 'entreprise_ax,';
+    if (! empty($_REQUEST["adrpro_public"][$i])) $visibilite .= 'adr_public,';
+    if (! empty($_REQUEST["adrpro_ax"][$i]))     $visibilite .= 'adr_ax,';
+    if (! empty($_REQUEST["telpro_public"][$i])) $visibilite .= 'tel_public,';
+    if (! empty($_REQUEST["telpro_ax"][$i]))     $visibilite .= 'tel_ax,';
+    if (! empty($visibilite)) $visibilite = substr($visibilite, 0, -1);
 
-$globals->db->query("REPLACE INTO entreprises(uid,entrid,entreprise,secteur,ss_secteur,poste,fonction,adr1,adr2,adr3,cp,ville,pays,region,tel,fax,visibilite) ".
+    $globals->db->query("REPLACE INTO entreprises(uid,entrid,entreprise,secteur,ss_secteur,poste,fonction,adr1,adr2,adr3,cp,ville,pays,region,tel,fax,visibilite) ".
               "VALUES ('{$_SESSION['uid']}','$i','".put_in_db($entreprise[$i])."',".
 	      ( ($secteur[$i] == "") ? "NULL ," : "'{$secteur[$i]}',") . //sinon un faux 0 est rentre dans la base
 	      ( ($ss_secteur[$i] == "") ? "NULL " : "'{$ss_secteur[$i]}'") .
 	      ",'".put_in_db($poste[$i])."','{$fonction[$i]}',".
               "'".put_in_db($adrpro1[$i])."','".put_in_db($adrpro2[$i])."', '".put_in_db($adrpro3[$i])."','".put_in_db($cppro[$i])."',".
-              "'".put_in_db($villepro[$i])."','".put_in_db($payspro[$i])."','".put_in_db($regionpro[$i])."','".put_in_db($telpro[$i])."','".put_in_db($faxpro[$i])."', '$visibilite')");
-  echo mysql_error();
+              "'".put_in_db($villepro[$i])."','".put_in_db($payspro[$i])."','"
+	      .put_in_db($regionpro[$i])."','".put_in_db($telpro[$i])."','".put_in_db($faxpro[$i])."', '$visibilite')");
 }
 $globals->db->query("UPDATE auth_user_md5 set cv='".put_in_db($cv)."' where user_id='{$_SESSION['uid']}'");
 ?>