Fixes nationalities deletion.

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index 7957fde..077b3dc 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -209,7 +209,7 @@ class ProfileModule extends PLModule
         if (is_null($id)) {
             return PL_NOT_FOUND;
         }
-        $pid = (!is_numeric($id) || S::has_perms()) ? Profile::getPID($id) : null;
+        $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null;
         if (is_null($pid)) {
             if (S::logged()) {
                 $page->trigError($id . " inconnu dans l'annuaire.");
@@ -334,7 +334,7 @@ class ProfileModule extends PLModule
         pl_cached_content_headers("text/javascript", "utf-8");
         $page->changeTpl('profile/grades.js.tpl', NO_SKIN);
         $res    = XDB::iterator("SELECT  *
-                                   FROM  profile_medal_enum_grades
+                                   FROM  profile_medal_grade_enum
                                ORDER BY  mid, pos");
         $grades = array();
         while ($tmp = $res->next()) {
@@ -443,10 +443,13 @@ class ProfileModule extends PLModule
                             ORDER BY  id',
                              $sssect);
         $page->changeTpl('profile/jobs.alternates.tpl', NO_SKIN);
-        $alternate  = $res->next();
-        $alternates = $alternate['name'];
-        while ($alternate  = $res->next()) {
-            $alternates .= ', ' . $alternate['name'];
+        $alternates = '';
+        if ($res->total() > 0) {
+            $alternate  = $res->next();
+            $alternates = $alternate['name'];
+            while ($alternate  = $res->next()) {
+                $alternates .= ', ' . $alternate['name'];
+            }
         }
         $page->assign('alternates', $alternates);
     }
@@ -483,12 +486,12 @@ class ProfileModule extends PLModule
         $page->assign('i', $id);
     }
 
-    function handler_ajax_buildnames(&$page, $data)
+    function handler_ajax_buildnames(&$page, $data, $isFemale)
     {
         header('Content-Type: text/html; charset=utf-8');
         $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN);
         require_once 'name.func.inc.php';
-        $page->assign('names', build_javascript_names($data));
+        $page->assign('names', build_javascript_names($data, $isFemale));
     }
 
     function handler_referent(&$page, $pf)
@@ -792,29 +795,29 @@ class ProfileModule extends PLModule
             $mid = $id;
 
             if (Post::v('act') == 'del') {
-                XDB::execute('DELETE FROM  profile_medal_enum_grades
+                XDB::execute('DELETE FROM  profile_medal_grade_enum
                                     WHERE  mid={?} AND gid={?}', $mid, Post::i('gid'));
             } else {
                 foreach (Post::v('grades', array()) as $gid=>$text) {
                     if ($gid === 0) {
                         if (!empty($text)) {
                             $res = XDB::query('SELECT  MAX(gid)
-                                                 FROM  profile_medal_enum_grades
+                                                 FROM  profile_medal_grade_enum
                                                 WHERE  mid = {?}', $mid);
                             $gid = $res->fetchOneCell() + 1;
 
-                            XDB::execute('INSERT INTO  profile_medal_enum_grades (mid, gid, text, pos)
+                            XDB::execute('INSERT INTO  profile_medal_grade_enum (mid, gid, text, pos)
                                                VALUES  ({?}, {?}, {?}, {?})',
                                 $mid, $gid, $text, $_POST['pos']['0']);
                         }
                     } else {
-                        XDB::execute('UPDATE  profile_medal_enum_grades
+                        XDB::execute('UPDATE  profile_medal_grade_enum
                                          SET  pos={?}, text={?}
                                        WHERE  gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid);
                     }
                 }
             }
-            $res = XDB::iterator('SELECT gid, text, pos FROM profile_medal_enum_grades WHERE mid={?} ORDER BY pos', $mid);
+            $res = XDB::iterator('SELECT gid, text, pos FROM profile_medal_grade_enum WHERE mid={?} ORDER BY pos', $mid);
             $page->assign('grades', $res);
         }
     }