Close #693: Fix "(X1234, Mines, )" empty education

description

 ChangeLog                       |    5 +++++
 include/applis.func.inc.php     |   31 +++++++++++++++++--------------
 templates/include/minifiche.tpl |    4 ++--
 3 files changed, 24 insertions(+), 16 deletions(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1906 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index ba98d30..12902a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,12 +15,14 @@ Bug/Wish:
     * Emails:
         - #687: Don't lose authentication when editing a long mail         -FRU
         - #688: From name in the sending form                              -FRU
+        - #703: Fix management of mail adresses containing '+'             -ALK
 
     * Profile:
         - Fix GoogleMaps links                                             -FRU
         - #663: Link to Xnet's map from the "My groups" page               -FRU
         - #689: Edit my profile from Xnet                                  -FRU
         - #692: Layout of the profile                                      -FRU
+        - #693: Fix empty description for generic education                -FRU
 
     * Xnet:
         - #694: Color of 'Promotion' groups                                -ALK
@@ -37,6 +39,9 @@ From 0.9.14 branch:
     * Payment:
         - #662: Fix the attribution of the payments                        -BOB
 
+    * XnetEvents:
+        - #684: Fix the list of coming members                             -FRU
+
 ================================================================================
 VERSION 0.9.14                                                        27 04 2007
 

diff --git a/include/applis.func.inc.php b/include/applis.func.inc.php
index b433862..eacbc34 100644 (file)
--- a/include/applis.func.inc.php
+++ b/include/applis.func.inc.php
@@ -25,9 +25,9 @@ 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";
+        $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;
 }

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 4236250..6149550 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -35,8 +35,8 @@
     {if $c.iso3166}
     <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
     {/if}
-    (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}
-    {/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
+    (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
+    *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
     {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
     {if $smarty.session.auth ge AUTH_COOKIE}
     {if !$c.dcd && !$c.wasinscrit}