X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fapplis.func.inc.php;h=b43386251cabd6e5b82fb42ab4544536ac507111;hb=493b6abebf3d6c35691f66fd1bfdc063efaab576;hp=6f317ffa64c7edf20dbe2754de644c22df5298dd;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git

diff --git a/include/applis.func.inc.php b/include/applis.func.inc.php
index 6f317ff..b433862 100644
--- a/include/applis.func.inc.php
+++ b/include/applis.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -22,9 +22,8 @@
 global $page;
 
 function applis_options($current=0) {
-    global $globals;
     $html = '<option value="-1"></option>';
-    $res  = $globals->xdb->iterator("select * from applis_def order by text");
+    $res  = XDB::iterator("select * from applis_def order by text");
     while ($arr_appli = $res->next()) { 
 	$html .= '<option value="'.$arr_appli["id"].'"';
 	if ($arr_appli["id"]==$current) $html .= " selected='selected'";
@@ -45,9 +44,8 @@ $page->register_function('applis_options','_applis_options_smarty');
 /** affiche un Array javascript contenant les types de chaque appli
  */
 function applis_type(){
-    global $globals;
     $html = "";
-    $res=$globals->xdb->iterRow("select type from applis_def order by text");
+    $res=XDB::iterRow("select type from applis_def order by text");
     if (list($appli_type) = $res->next()) {
 	$html .= "new Array('".str_replace(",","','",$appli_type)."')";
     }
@@ -61,8 +59,7 @@ $page->register_function('applis_type','applis_type');
 /** affiche tous les types possibles d'applis
  */
 function applis_type_all(){
-    global $globals;
-    $res = $globals->xdb->query("show columns from applis_def like 'type'");
+    $res = XDB::query("show columns from applis_def like 'type'");
     $arr_appli = $res->fetchOneAssoc();
     return str_replace(")","",str_replace("set(","",$arr_appli["Type"]));
 }
@@ -72,9 +69,9 @@ $page->register_function('applis_type_all','applis_type_all');
  */
 function applis_fmt($type, $text, $url) {
     $txt="";
-    if (($type!="Ingénieur")&&($type!="Diplôme"))
+    if (($type!="Ingénieur")&&($type!="Diplôme"))
 	$txt .= $type;
-    if ($text!="Université") {
+    if ($text!="Université") {
 	if ($txt) $txt .= " ";
 	if ($url) 
 	    $txt .= "<a href=\"$url\" onclick=\"return popup(this)\">$text</a>";
@@ -89,4 +86,5 @@ function _applis_fmt($params, &$smarty) {
 }
 $page->register_function('applis_fmt','_applis_fmt');
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>