Overview
Comment:Traiter correctement les appels à favicon.ico
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: bdfb85cf678a4434a4990883bc863e2b727809de
User & Date: bohwaz on 2015-02-13 02:34:28
Other Links: manifest | tags
Context
2015-02-13
02:37
Correction appel namespace check-in: b1ba703d80 user: bohwaz tags: trunk
02:34
Traiter correctement les appels à favicon.ico check-in: bdfb85cf67 user: bohwaz tags: trunk
01:29
Pour éviter les soucis d'IPv6 mal configuré (firefox…) on fixe localhost sur 127.0.0.1 check-in: e8fdbaace0 user: bohwaz tags: trunk
Changes

Modified src/include/lib/Garradin/Squelette.php from [8d37cf8c3d] to [7bd39e6d71].

650
651
652
653
654
655
656





657
658
659
660
661
662
663
        {
            $skel = 'sommaire.html';
        }
        elseif ($uri == '/feed/atom/')
        {
            header('Content-Type: application/atom+xml');
            $skel = 'atom.xml';





        }
        elseif (substr($uri, -1) == '/')
        {
            $skel = 'rubrique.html';
            $_GET['uri'] = $_REQUEST['uri'] = substr($uri, 1, -1);
        }
        elseif (preg_match('!^/admin/!', $uri))







>
>
>
>
>







650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
        {
            $skel = 'sommaire.html';
        }
        elseif ($uri == '/feed/atom/')
        {
            header('Content-Type: application/atom+xml');
            $skel = 'atom.xml';
        }
        elseif ($uri == '/favicon.ico')
        {
            header('Location: ' . WWW_URI . 'admin/static/icon.png');
            exit;
        }
        elseif (substr($uri, -1) == '/')
        {
            $skel = 'rubrique.html';
            $_GET['uri'] = $_REQUEST['uri'] = substr($uri, 1, -1);
        }
        elseif (preg_match('!^/admin/!', $uri))

Modified src/templates/admin/_foot.tpl from [abb2906114] to [37807b9eb8].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
</div>

<script type="text/javascript" defer="defer">
{literal}
(function () {
    var keep_session_url = "{/literal}{$www_url}{literal}admin/login.php?keepSessionAlive&amp;";

    function refreshSession()
    {
        var _RIMAGE = new Image(1,1);
        _RIMAGE.src = keep_session_url + Math.round(Math.random()*1000000000);
    }
    window.setInterval(refreshSession, 10 * 60 * 1000);
} ());
{/literal}
</script>

</body>
</html>





|













1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
</div>

<script type="text/javascript" defer="defer">
{literal}
(function () {
    var keep_session_url = "{/literal}{$www_url}{literal}admin/login.php?keepSessionAlive&";

    function refreshSession()
    {
        var _RIMAGE = new Image(1,1);
        _RIMAGE.src = keep_session_url + Math.round(Math.random()*1000000000);
    }
    window.setInterval(refreshSession, 10 * 60 * 1000);
} ());
{/literal}
</script>

</body>
</html>

Modified src/templates/admin/_head.tpl from [9580b680e7] to [a5542175dd].

1
2
3
4
5

6
7
8
9
10
11
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>{$title|escape}</title>

    <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densitydpi=device-dpi" />
    <link rel="stylesheet" type="text/css" href="{$admin_url}static/admin.css" media="all" />
    <link rel="stylesheet" type="text/css" href="{$admin_url}static/print.css" media="print" />
    <link rel="stylesheet" type="text/css" href="{$admin_url}static/handheld.css" media="handheld,screen and (max-width:981px)" />
    {if isset($js) || isset($custom_js)}
        <script type="text/javascript" src="{$admin_url}static/scripts/global.js"></script>
    {/if}





>







1
2
3
4
5
6
7
8
9
10
11
12
13
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>{$title|escape}</title>
    <link rel="icon" type="image/png" href="{$admin_url}static/icon.png" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densitydpi=device-dpi" />
    <link rel="stylesheet" type="text/css" href="{$admin_url}static/admin.css" media="all" />
    <link rel="stylesheet" type="text/css" href="{$admin_url}static/print.css" media="print" />
    <link rel="stylesheet" type="text/css" href="{$admin_url}static/handheld.css" media="handheld,screen and (max-width:981px)" />
    {if isset($js) || isset($custom_js)}
        <script type="text/javascript" src="{$admin_url}static/scripts/global.js"></script>
    {/if}

Added src/www/admin/static/icon.png version [b262553baa].

cannot compute difference between binary files

Modified src/www/index.php from [115e526b6f] to [9ff0d03ddb].

1
2
3
4
5
6
7
8
9
<?php
namespace Garradin;

require __DIR__ . '/_inc.php';

$squelette = new Squelette;
$squelette->dispatchURI();

?>







<
<
1
2
3
4
5
6
7


<?php
namespace Garradin;

require __DIR__ . '/_inc.php';

$squelette = new Squelette;
$squelette->dispatchURI();