merge with master

[platal.git] / include / applis.func.inc.php

diff --git a/include/applis.func.inc.php b/include/applis.func.inc.php
index 4d12501..849adc3 100644 (file)
--- 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-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,10 +24,10 @@ global $page;
 function applis_options($current=0) {
     $html = '<option value="-1"></option>';
     $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'";
-       $html .= '>'.htmlspecialchars($arr_appli["text"])."</option>\n";
+    while ($arr_appli = $res->next()) {
+        $html .= '<option value="'.$arr_appli["id"].'"';
+        if ($arr_appli["id"]==$current) $html .= " selected='selected'";
+        $html .= '>'.htmlspecialchars($arr_appli["text"])."</option>\n";
     }
     return $html;
 }
@@ -35,7 +35,7 @@ function applis_options($current=0) {
  */
 function _applis_options_smarty($params){
     if(!isset($params['selected']))
-       $params['selected'] = 0;
+        $params['selected'] = 0;
     return applis_options($params['selected']);
 }
 $page->register_function('applis_options','_applis_options_smarty');
@@ -47,10 +47,10 @@ function applis_type(){
     $html = "";
     $res=XDB::iterRow("select type from applis_def order by text");
     if (list($appli_type) = $res->next()) {
-       $html .= "new Array('".str_replace(",","','",$appli_type)."')";
+        $html .= "new Array('".str_replace(",","','",$appli_type)."')";
     }
     while (list($appli_type) = $res->next()) {
-       $html .= ",\nnew Array('".str_replace(",","','",$appli_type)."')";
+        $html .= ",\nnew Array('".str_replace(",","','",$appli_type)."')";
     }
     return $html;
 }
@@ -69,14 +69,17 @@ $page->register_function('applis_type_all','applis_type_all');
  */
 function applis_fmt($type, $text, $url) {
     $txt="";
-    if (($type!="Ingénieur")&&($type!="Diplôme"))
-       $txt .= $type;
-    if ($text!="Université") {
-       if ($txt) $txt .= " ";
-       if ($url) 
-           $txt .= "<a href=\"$url\" onclick=\"return popup(this)\">$text</a>";
-       else 
-           $txt .= $text;
+    if (($type != "Ingénieur") && ($type != "Diplôme"))
+        $txt .= $type;
+    if ($text != "Université") {
+        if ($txt) $txt .= ' ';
+        if ($url)
+            $txt .= "<a href=\"$url\" onclick=\"return popup(this)\">$text</a>";
+        else
+            $txt .= $text;
+    }
+    if (!$txt) {
+        $txt .= $text;
     }
     return $txt;
 }
@@ -86,4 +89,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:
 ?>