Fix link for displaying pending picture on profile (Closes #1166)

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index 8de0530..3c0cb27 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -779,6 +779,7 @@ class AdminModule extends PLModule
                 }
             } else if (Env::t('add_type') == 'account') {
                 $type = Env::t('type');
+                $newAccounts = array();
                 foreach ($lines as $line) {
                     if ($infos = self::formatNewUser($page, $line, $separator, $type, 4)) {
                         $sex = self::formatSex($page, $infos[3], $line);
@@ -786,9 +787,13 @@ class AdminModule extends PLModule
                             XDB::execute('INSERT INTO  accounts (hruid, type, is_admin, state, email, full_name, display_name, sex)
                                                VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
                                          $infos['hrid'], $type, 0, 'active', $infos[2], $infos[1] . ' ' . $infos[0], $infos[1], $sex);
+                            $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0];
                         }
                     }
                 }
+                if (!empty($newAccounts)) {
+                    $page->assign('newAccounts', $newAccounts);
+                }
             } else if (Env::t('add_type') == 'ax_id') {
                 $type = 'x';
                 foreach ($lines as $line) {
@@ -899,19 +904,19 @@ class AdminModule extends PLModule
         if ($validate) {
             S::assert_xsrf_token();
 
-            $res = XDB::iterRow('SELECT  p.hrpid, pd.directory_name, p.deathdate
+            $res = XDB::iterRow('SELECT  p.pid, pd.directory_name, p.deathdate
                                    FROM  profiles AS p
                              INNER JOIN  profile_display AS pd ON (p.pid = pd.pid)
                                   WHERE  pd.promo = {?}', $promo);
             while (list($pid, $name, $death) = $res->next()) {
-                $val = Env::v($pid);
-                if($val == $deces || empty($val)) {
+                $val = Env::v('death_' . $pid);
+                if($val == $death || empty($val)) {
                     continue;
                 }
 
                 XDB::execute('UPDATE  profiles
                                  SET  deathdate = {?}, deathdate_rec = NOW()
-                               WHERE  hrpid = {?}', $val, $pid);
+                               WHERE  pid = {?}', $val, $pid);
                 $page->trigSuccess('Ajout du décès de ' . $name . ' le ' . $val . '.');
                 if($death == '0000-00-00' || empty($death)) {
                     $profile = Profile::get($pid);
@@ -921,7 +926,7 @@ class AdminModule extends PLModule
             }
         }
 
-        $res = XDB::iterator('SELECT  p.hrpid, pd.directory_name, p.deathdate
+        $res = XDB::iterator('SELECT  p.pid, pd.directory_name, p.deathdate
                                 FROM  profiles AS p
                           INNER JOIN  profile_display AS pd ON (p.pid = pd.pid)
                                WHERE  pd.promo = {?}
@@ -1393,8 +1398,8 @@ class AdminModule extends PLModule
                                        t.display_tel AS tel, f.display_tel AS fax, a.text AS address
                                  FROM  profile_job_enum  AS e
                             LEFT JOIN  profile_job_enum  AS h ON (e.holdingid = h.id)
-                            LEFT JOIN  profile_phones    AS t ON (t.pid = e.id AND link_type = 'hq' AND tel_id = 0)
-                            LEFT JOIN  profile_phones    AS f ON (f.pid = e.id AND link_type = 'hq' AND tel_id = 1)
+                            LEFT JOIN  profile_phones    AS t ON (t.pid = e.id AND t.link_type = 'hq' AND t.tel_id = 0)
+                            LEFT JOIN  profile_phones    AS f ON (f.pid = e.id AND f.link_type = 'hq' AND f.tel_id = 1)
                             LEFT JOIN  profile_addresses AS a ON (a.jobid = e.id AND a.type = 'hq')
                                 WHERE  e.id = {?}",
                               $id);