Removes the now unused make_forlife smarty function.

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index 68700f7..47fd735 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -73,35 +73,40 @@ class ProfileModule extends PLModule
 
     function handler_photo(&$page, $x = null, $req = null)
     {
-        if (is_null($x)) {
+        if (!$x || !($user = User::getSilent($x))) {
             return PL_NOT_FOUND;
         }
 
-        $res = XDB::query("SELECT id, pub FROM aliases
-                                  LEFT JOIN photo ON(id = uid)
-                                      WHERE alias = {?}", $x);
-        list($uid, $photo_pub) = $res->fetchOneRow();
+        // Retrieve the photo and its mime type.
+        $photo_data = null;
+        $photo_type = null;
 
         if ($req && S::logged()) {
             include 'validations.inc.php';
-            $myphoto = PhotoReq::get_request($uid);
-            Header('Content-type: image/'.$myphoto->mimetype);
-            echo $myphoto->data;
+            $myphoto = PhotoReq::get_request($user->id());
+            if ($myphoto) {
+                $photo_data = $myphoto->data;
+                $photo_type = $myphoto->mimetype;
+            }
         } else {
             $res = XDB::query(
-                    "SELECT  attachmime, attach
+                    "SELECT  attachmime, attach, pub
                        FROM  photo
-                      WHERE  uid={?}", $uid);
-
-            if ((list($type, $data) = $res->fetchOneRow())
-            &&  ($photo_pub == 'public' || S::logged())) {
-                Header("Content-type: image/$type");
-                echo $data;
-            } else {
-                Header('Content-type: image/png');
-                echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png');
+                      WHERE  uid = {?}", $user->id());
+            list($photo_type, $photo_data, $photo_pub) = $res->fetchOneRow();
+            if ($photo_pub != 'public' && !S::logged()) {
+                $photo_type = $photo_data = null;
             }
         }
+
+        // Display the photo, or a default one when not available.
+        if ($photo_type && $photo_data != null) {
+            header('Content-type: image/' . $photo_type);
+            echo $photo_data;
+        } else {
+            header('Content-type: image/png');
+            echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png');
+        }
         exit;
     }
 
@@ -136,7 +141,7 @@ class ProfileModule extends PLModule
         if (Env::has('upload')) {
             S::assert_xsrf_token();
 
-            $upload = new PlUpload(S::v('forlife'), 'photo');
+            $upload = new PlUpload(S::user()->login(), 'photo');
             if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) {
                 $page->trigError('Une erreur est survenue lors du téléchargement du fichier');
             } else {
@@ -148,7 +153,7 @@ class ProfileModule extends PLModule
         } elseif (Env::has('trombi')) {
             S::assert_xsrf_token();
 
-            $upload = new PlUpload(S::v('forlife'), 'photo');
+            $upload = new PlUpload(S::user()->login(), 'photo');
             if ($upload->copyFrom($trombi_x)) {
                 $myphoto = new PhotoReq(S::v('uid'), $upload);
                 if ($myphoto->isValid()) {
@@ -198,19 +203,15 @@ class ProfileModule extends PLModule
         if (!S::logged() || Env::v('view') == 'public') $view = 'public';
         if (S::logged() && Env::v('view') == 'ax')      $view = 'ax';
 
-        if (is_numeric($x)) {
-            $res = XDB::query(
-                    "SELECT  alias
-                       FROM  aliases       AS a
-                 INNER JOIN  auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie')
-                      WHERE  matricule={?}", $x);
-            $login = $res->fetchOneCell();
-        } else {
-            $login = get_user_forlife($x, S::logged() ? '_default_user_callback'
-                                                      : '_silent_user_callback');
+        $login = S::logged() ? User::get($x) : User::getSilent($x);
+        if (!$login) {
+            return PL_NOT_FOUND;
         }
 
-        if (empty($login)) {
+        $res = XDB::query("SELECT  perms IN ('admin','user','disabled')
+                             FROM  auth_user_md5
+                            WHERE  user_id = {?}", $login->id());
+        if (!$res->fetchOneCell()) {
             $user = get_not_registered_user($x, true);
             if ($user->total() != 1) {
                 return PL_NOT_FOUND;
@@ -222,11 +223,11 @@ class ProfileModule extends PLModule
             $user['forlife'] = $x;
         } else {
             $new   = Env::v('modif') == 'new';
-            $user  = get_user_details($login, S::v('uid'), $view);
+            $user  = get_user_details($login->login(), S::v('uid'), $view);
         }
 
         if (S::logged()) {
-            S::logger()->log('view_profile', $login);
+            S::logger()->log('view_profile', $login->login());
         }
 
         $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] );
@@ -281,18 +282,17 @@ class ProfileModule extends PLModule
 
     function handler_ax(&$page, $user = null)
     {
-        require_once 'user.func.inc.php';
-        $user = get_user_forlife($user);
+        $user = User::get($user);
         if (!$user) {
             return PL_NOT_FOUND;
         }
-        $res = XDB::query('SELECT matricule_ax
-                             FROM auth_user_md5 AS u
-                       INNER JOIN aliases       AS a ON (a.type = "a_vie" AND a.id = u.user_id)
-                            WHERE a.alias = {?}', $user);
+
+        $res = XDB::query("SELECT  matricule_ax
+                             FROM  auth_user_md5
+                            WHERE  user_id = {?}", $user->id());
         $mat = $res->fetchOneCell();
         if (!intval($mat)) {
-            $page->kill("Le matricule AX de $user est inconnu");
+            $page->kill("Le matricule AX de {$user->login()} est inconnu");
         }
         http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat");
     }