migrate getlogo

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

diff --git a/htdocs.net/groupe/getlogo.php b/htdocs.net/groupe/getlogo.php
deleted file mode 100644 (file)
index 21f483b..0000000
--- a/htdocs.net/groupe/getlogo.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require 'xnet.inc.php';
-
-$res = $globals->xdb->query("SELECT logo, logo_mime FROM groupex.asso WHERE id = {?}", $globals->asso('id'));
-list($logo, $logo_mime) = $res->fetchOneRow();
-
-if (!empty($logo)) {
-    header("Content-type: $mime");
-    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-    header("Last-Modified:" . gmdate("D, d M Y H:i:s") . " GMT");
-    header("Cache-Control: no-cache, must-revalidate");
-    header("Pragma: no-cache");
-    echo $logo;
-} else {
-    header("Content-type: image/jpeg");
-    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-    header("Last-Modified:" . gmdate("D, d M Y H:i:s") . " GMT");
-    header("Cache-Control: no-cache, must-revalidate");
-    header("Pragma: no-cache");
-    readfile("../images/dflt_carre.jpg");
-}
-
-?>

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index b6d7968..feb9239 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -24,7 +24,9 @@ class XnetGrpModule extends PLModule
     function handlers()
     {
         return array(
-            'grp' => $this->make_hook('index', AUTH_PUBLIC),
+            'grp'             => $this->make_hook('index', AUTH_PUBLIC),
+            'grp/asso.php'    => $this->make_hook('index', AUTH_PUBLIC),
+            'grp/logo'        => $this->make_hook('logo',  AUTH_PUBLIC),
         );
     }
 
@@ -44,6 +46,34 @@ class XnetGrpModule extends PLModule
 
         $page->assign('asso', $globals->asso());
     }
+
+    function handler_logo(&$page)
+    {
+        global $globals;
+
+        $res = $globals->xdb->query("SELECT logo, logo_mime
+                                       FROM groupex.asso WHERE id = {?}",
+                                    $globals->asso('id'));
+        list($logo, $logo_mime) = $res->fetchOneRow();
+
+        if (!empty($logo)) {
+            header("Content-type: $mime");
+            header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+            header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
+            header('Cache-Control: no-cache, must-revalidate');
+            header('Pragma: no-cache');
+            echo $logo;
+        } else {
+            header('Content-type: image/jpeg');
+            header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+            header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
+            header('Cache-Control: no-cache, must-revalidate');
+            header('Pragma: no-cache');
+            readfile(dirname(__FILE__).'/../htdocs.net/images/dflt_carre.jpg');
+        }
+
+        exit;
+    }
 }
 
 ?>

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index 2762497..3a7e082 100644 (file)
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -21,9 +21,9 @@
 {**************************************************************************}
 
 {if $asso.site}
-<a href="{$asso.site}"><img src='{rel}/{$platal->ns}getlogo.php' alt="LOGO" style="float: right;" /></a>
+<a href="{$asso.site}"><img src='{rel}/{$platal->ns}logo' alt="LOGO" style="float: right;" /></a>
 {else}
-<img src='{rel}/{$platal->ns}getlogo.php' alt="LOGO" style="float: right;" />
+<img src='{rel}/{$platal->ns}logo' alt="LOGO" style="float: right;" />
 {/if}
 
 <h1>{$asso.nom} : Accueil</h1>

diff --git a/templates/xnet/groupe/edit.tpl b/templates/xnet/groupe/edit.tpl
index 1e10b55..f62348b 100644 (file)
--- a/templates/xnet/groupe/edit.tpl
+++ b/templates/xnet/groupe/edit.tpl
@@ -20,7 +20,7 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<img src='getlogo.php' alt="LOGO" style="float: right;" />
+<img src='{rel}/{$platal->ns}logo' alt="LOGO" style="float: right;" />
 
 <h1>{$asso.nom} : Éditer l'accueil</h1>