From 64e019c67a2086f5453077846b789f140a7e48e5 Mon Sep 17 00:00:00 2001
From: "Pierre Habouzit (MadCoder" <pierre.habouzit@m4x.org>
Date: Mon, 10 Jan 2005 15:52:18 +0000
Subject: [PATCH] getphoto does not take uid anymore

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-264
---
 htdocs/getphoto.php                     | 14 +++++---------
 templates/admin/admin_trombino.tpl      |  6 +++---
 templates/include/form.valid.photos.tpl |  4 ++--
 templates/profil/general.tpl            |  2 +-
 templates/trombino.tpl                  |  4 ++--
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/htdocs/getphoto.php b/htdocs/getphoto.php
index 4cd6956..815b35f 100644
--- a/htdocs/getphoto.php
+++ b/htdocs/getphoto.php
@@ -30,15 +30,11 @@ if (Env::has('x')) {
 	Header('Content-type: image/'.$myphoto->mimetype);
 	echo $myphoto->data;
     } else {
-	if(preg_match('/^\d*$/', Env::get('x'))) {
-	    $res = $globals->xdb->query('SELECT attachmime, attach FROM photo WHERE uid = {?}', Env::getInt('x'));
-	} else {
-	    $res = $globals->xdb->query(
-                    "SELECT  attachmime, attach
-                       FROM  photo   AS p
-                 INNER JOIN  aliases AS a ON p.uid=a.id
-                      WHERE  alias={?}", Env::get('x'));
-	}
+        $res = $globals->xdb->query(
+                "SELECT  attachmime, attach
+                   FROM  photo   AS p
+             INNER JOIN  aliases AS a ON p.uid=a.id
+                  WHERE  alias={?}", Env::get('x'));
 
 	if( list($type,$data) = $res->fetchOneRow() ) {
 	    Header(  "Content-type: image/$type");
diff --git a/templates/admin/admin_trombino.tpl b/templates/admin/admin_trombino.tpl
index ea6b7df..984cbd8 100644
--- a/templates/admin/admin_trombino.tpl
+++ b/templates/admin/admin_trombino.tpl
@@ -27,15 +27,15 @@
 Photo actuelle de {$forlife}
 </p>
 
-<img src="../getphoto.php?x={$smarty.request.uid}" alt="[ PHOTO ]" />
+<img src="../getphoto.php?x={$forlife}" alt="[ PHOTO ]" />
 <br />
 
 <p>
-<a href="{$smarty.server.PHP_SELF}?uid={$smarty.request.uid}&amp;action=supprimer">Supprimer cette photo</a>
+<a href="?uid={$smarty.request.uid}&amp;action=supprimer">Supprimer cette photo</a>
 </p>
 
 <p>
-<a href="{$smarty.server.PHP_SELF}?uid={$smarty.request.uid}&amp;action=ecole">Voir sa photo de trombi récupérée à l'école (si disponible)</a>
+<a href="?uid={$smarty.request.uid}&amp;action=ecole">Voir sa photo de trombi récupérée à l'école (si disponible)</a>
 </p>
 
 <form action="{$smarty.server.PHP_SELF}" method="post" enctype="multipart/form-data">
diff --git a/templates/include/form.valid.photos.tpl b/templates/include/form.valid.photos.tpl
index 06b6bc4..e6b1dfd 100644
--- a/templates/include/form.valid.photos.tpl
+++ b/templates/include/form.valid.photos.tpl
@@ -21,9 +21,9 @@
 <tr class="pair">
   <td class="titre">Photos</td>
   <td>
-    <img src="{rel}/getphoto.php?x={$valid->uid}" style="width:110px;" alt=" [ PHOTO ] " />
+    <img src="{rel}/getphoto.php?x={$valid->forlife}" style="width:110px;" alt=" [ PHOTO ] " />
     &nbsp;&nbsp;&nbsp;&nbsp;
-    <img src="{rel}/getphoto.php?x={$valid->uid}&amp;req=true" style="width:110px;" alt=" [ PHOTO ] " />
+    <img src="{rel}/getphoto.php?x={$valid->forlife}&amp;req=true" style="width:110px;" alt=" [ PHOTO ] " />
   </td>
 </tr>
 
diff --git a/templates/profil/general.tpl b/templates/profil/general.tpl
index d731365..a5ea19a 100644
--- a/templates/profil/general.tpl
+++ b/templates/profil/general.tpl
@@ -148,7 +148,7 @@
               {/if}.
             </td>
             <td class="dcolg">
-              <img src="getphoto.php?x={$smarty.session.uid}{*{if $smarty.cookies|@count == 0}&amp;{php}echo SID;{/php}{/if}*}" alt=" [ PHOTO ] " />
+              <img src="getphoto.php?x={$smarty.session.forlife}" alt=" [ PHOTO ] " />
             </td>
           </tr>
         </table>
diff --git a/templates/trombino.tpl b/templates/trombino.tpl
index 9f3db6b..e4ade73 100644
--- a/templates/trombino.tpl
+++ b/templates/trombino.tpl
@@ -48,11 +48,11 @@
     </tr>
     <tr>
       <td class="center">
-        <img src="{rel}/getphoto.php?x={$smarty.session.uid}" width="200" alt=" [ PHOTO ] " />
+        <img src="{rel}/getphoto.php?x={$smarty.session.forlife}" width="200" alt=" [ PHOTO ] " />
       </td>
       <td class="center half">
         {if $submited}
-        <img src="{rel}/getphoto.php?x={$smarty.session.uid}&amp;req=true" width="200" alt=" [ PHOTO ] " />
+        <img src="{rel}/getphoto.php?x={$smarty.session.forlife}&amp;req=true" width="200" alt=" [ PHOTO ] " />
         {else}
         Pas d'image soumise
         {/if}
-- 
2.1.4