exit getphoto.php => photo

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

diff --git a/htdocs/fiche.php b/htdocs/fiche.php
index 4ff1587..2453df2 100644 (file)
--- a/htdocs/fiche.php
+++ b/htdocs/fiche.php
@@ -60,7 +60,7 @@ $page->assign('xorg_title', $title);
 
 // photo
 
-$photo = 'getphoto.php?x='.$user['forlife'].($new ? '&req=true' : '');
+$photo = 'photo/'.$user['forlife'].($new ? '/req' : '');
 
 if(!isset($user['y']) and !isset($user['x'])) {
     list($user['x'], $user['y']) = getimagesize("images/none.png");

diff --git a/htdocs/getphoto.php b/htdocs/getphoto.php
deleted file mode 100644 (file)
index 5533dec..0000000
--- a/htdocs/getphoto.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-
-require_once('xorg.inc.php');
-new_skinned_page('login.tpl', AUTH_PUBLIC);
-
-if (Env::has('x')) {
-
-    $res = $globals->xdb->query("SELECT id, pub FROM aliases LEFT JOIN photo ON(id=uid) WHERE alias = {?}", Env::get('x'));
-    list($uid, $photo_pub) = $res->fetchOneRow();
-    
-    if (Env::get('req') == "true" && logged()) {
-        include 'validations.inc.php';
-       $myphoto = PhotoReq::get_request($uid);
-        Header('Content-type: image/'.$myphoto->mimetype);
-       echo $myphoto->data;
-    } else {
-        $res = $globals->xdb->query(
-                "SELECT  attachmime, attach
-                   FROM  photo
-                  WHERE  uid={?}", $uid);
-
-       if( (list($type,$data) = $res->fetchOneRow()) && ($photo_pub == 'public' || logged()) ) {
-           Header(  "Content-type: image/$type");
-           echo $data;
-       } else {
-           Header(  'Content-type: image/png');
-           echo file_get_contents(dirname(__FILE__).'/images/none.png');
-       }
-    }
-}
-
-// vim:set et sws=4 sw=4 sts=4:
-?>

diff --git a/modules/profile.php b/modules/profile.php
index 4c3703e..2d12210 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -24,6 +24,7 @@ class ProfileModule extends PLModule
     function handlers()
     {
         return array(
+            'photo'  => $this->make_hook('photo',  AUTH_PUBLIC),
             'trombi' => $this->make_hook('trombi', AUTH_COOKIE),
         );
     }
@@ -52,6 +53,41 @@ class ProfileModule extends PLModule
         return array($pnb, $res->fetchAllAssoc());
     }
 
+    function handler_photo(&$page, $x = null, $req = null)
+    {
+        if (is_null($x)) {
+            return PL_NOT_FOUND;
+        }
+
+        global $globals;
+
+        $res = $globals->xdb->query("SELECT id, pub FROM aliases
+                                  LEFT JOIN photo ON(id = uid)
+                                      WHERE alias = {?}", $x);
+        list($uid, $photo_pub) = $res->fetchOneRow();
+
+        if ($req && logged()) {
+            include 'validations.inc.php';
+            $myphoto = PhotoReq::get_request($uid);
+            Header('Content-type: image/'.$myphoto->mimetype);
+            echo $myphoto->data;
+        } else {
+            $res = $globals->xdb->query(
+                    "SELECT  attachmime, attach
+                       FROM  photo
+                      WHERE  uid={?}", $uid);
+
+            if ((list($type,$data) = $res->fetchOneRow()) && ($photo_pub == 'public' || logged())) {
+                Header("Content-type: image/$type");
+                echo $data;
+            } else {
+                Header('Content-type: image/png');
+                echo file_get_contents(dirname(__FILE__).'../htdocs/images/none.png');
+            }
+        }
+        exit;
+    }
+
     function handler_trombi(&$page, $promo = null)
     {
         require_once 'trombi.inc.php';

diff --git a/templates/admin/admin_trombino.tpl b/templates/admin/admin_trombino.tpl
index 828a55c..627ed65 100644 (file)
--- a/templates/admin/admin_trombino.tpl
+++ b/templates/admin/admin_trombino.tpl
@@ -29,7 +29,7 @@
 Photo actuelle de {$forlife}
 </p>
 
-<img src="../getphoto.php?x={$forlife}" alt="[ PHOTO ]" />
+<img src="{rel}/photo/{$forlife}" alt="[ PHOTO ]" />
 <br />
 
 <p>

diff --git a/templates/include/form.valid.photos.tpl b/templates/include/form.valid.photos.tpl
index 5c85d62..847d28a 100644 (file)
--- a/templates/include/form.valid.photos.tpl
+++ b/templates/include/form.valid.photos.tpl
@@ -23,9 +23,9 @@
 <tr class="pair">
   <td class="titre">Photos</td>
   <td>
-    <img src="{rel}/getphoto.php?x={$valid->forlife}" style="width:110px;" alt=" [ PHOTO ] " />
+    <img src="{rel}/photo/{$valid->forlife}" style="width:110px;" alt=" [ PHOTO ] " />
     &nbsp;&nbsp;&nbsp;&nbsp;
-    <img src="{rel}/getphoto.php?x={$valid->forlife}&amp;req=true" style="width:110px;" alt=" [ PHOTO ] " />
+    <img src="{rel}/photo/{$valid->forlife}/req" style="width:110px;" alt=" [ PHOTO ] " />
   </td>
 </tr>
 

diff --git a/templates/include/trombi.tpl b/templates/include/trombi.tpl
index 1a45528..5d54562 100644 (file)
--- a/templates/include/trombi.tpl
+++ b/templates/include/trombi.tpl
@@ -29,7 +29,7 @@
   {/if}
     <td class="center">
       <a href="{"fiche.php"|url}?user={$p.forlife}" class="popup2">
-        <img src="{"getphoto.php"|url}?x={$p.forlife}" width="110" alt=" [ PHOTO ] " />
+        <img src="{rel}/photo/{$p.forlife}" width="110" alt=" [ PHOTO ] " />
       </a>
       {if $trombi_admin && $smarty.session.perms eq 'admin'}
       <a href="{"admin/admin_trombino.php"|url}?uid={$p.user_id}">

diff --git a/templates/listes/trombi.tpl b/templates/listes/trombi.tpl
index 5dbabc7..357a1a3 100644 (file)
--- a/templates/listes/trombi.tpl
+++ b/templates/listes/trombi.tpl
@@ -77,7 +77,7 @@
       {cycle values="1,2,3" assign="loop"}
       {if $loop eq "1"}<tr>{/if}
         <td class='center'>
-          <img src="{"getphoto.php"|url}?x={$x.l}" width="110" alt=" [ PHOTO ] " />
+          <img src="{rel}/photo/{$x.l}" width="110" alt=" [ PHOTO ] " />
           <br />
           <a href="{"fiche.php"|url}?user={$x.l}" class="popup2">
             {$x.n} ({$promo})

diff --git a/templates/profil/general.tpl b/templates/profil/general.tpl
index 1144e68..dd3decb 100644 (file)
--- a/templates/profil/general.tpl
+++ b/templates/profil/general.tpl
@@ -221,7 +221,7 @@
               {/if}.
             </td>
             <td class="dcolg">
-              <img src="getphoto.php?x={$smarty.session.forlife}" alt=" [ PHOTO ] " />
+              <img src="{rel}/photo/{$smarty.session.forlife}" alt=" [ PHOTO ] " />
             </td>
           </tr>
         </table>

diff --git a/templates/trombino.tpl b/templates/trombino.tpl
index 158b266..7bbb9c7 100644 (file)
--- a/templates/trombino.tpl
+++ b/templates/trombino.tpl
@@ -50,11 +50,11 @@
     </tr>
     <tr>
       <td class="center">
-        <img src="{rel}/getphoto.php?x={$smarty.session.forlife}" width="200" alt=" [ PHOTO ] " />
+        <img src="{rel}/photo/{$smarty.session.forlife}" width="200" alt=" [ PHOTO ] " />
       </td>
       <td class="center half">
         {if $submited}
-        <img src="{rel}/getphoto.php?x={$smarty.session.forlife}&amp;req=true" width="200" alt=" [ PHOTO ] " />
+        <img src="{rel}/photo/{$smarty.session.forlife}/req" width="200" alt=" [ PHOTO ] " />
         {else}
         Pas d'image soumise
         {/if}