From b253b2af2e69fc6be1d45d8349aaa5cf91e1f683 Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Sat, 11 Jan 2020 15:32:57 +0100
Subject: [PATCH] =?UTF-8?q?Suppression=20r=C3=A9f=C3=A9rences=20=C3=A0=20i?=
 =?UTF-8?q?ndex.php=20inutiles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 action.php                        | 10 +++++-----
 install.php                       |  2 +-
 templates/marigolds/header.html   |  6 +++---
 templates/marigolds/index.html    | 12 ++++++------
 templates/marigolds/settings.html |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/action.php b/action.php
index 9ef0115b..da5b000f 100644
--- a/action.php
+++ b/action.php
@@ -78,7 +78,7 @@
         if(isset($_['last-event-id']))$whereClause['id'] = '<= ' . $_['last-event-id'];
         $eventManager->change(array('unread'=>'0'),$whereClause);
         if(!Functions::isAjaxCall()){
-            header('location: ./index.php');
+            header('location: ./');
         }
     break;
 
@@ -94,7 +94,7 @@
         }
 
         if (!Functions::isAjaxCall()){
-            header('location: ./index.php');
+            header('location: ./');
         }
 
     break;
@@ -466,11 +466,11 @@
             $user = $userManager->exist($_['login'],$_['password'],$salt,@$_['otp']);
             if($user==false){
                 error_log("Leed: wrong login for '".$_['login']."'");
-                header('location: ./index.php?action=wrongLogin');
+                header('location: ./?action=wrongLogin');
             }else{
                 $_SESSION['currentUser'] = serialize($user);
                 if (isset($_['rememberMe'])) $user->setStayConnected();
-                header('location: ./index.php');
+                header('location: ./');
             }
             exit();
         }
@@ -498,7 +498,7 @@
         $_SESSION = array();
         session_unset();
         session_destroy();
-        header('location: ./index.php');
+        header('location: ./');
     break;
 
     case 'displayOnlyUnreadFeedFolder':
diff --git a/install.php b/install.php
index e8b8314c..16e7625b 100644
--- a/install.php
+++ b/install.php
@@ -118,7 +118,7 @@
 <div class="global-wrapper">
     <div id="header-container">
         <header class="wrapper clearfix">
-            <h1 class="logo" id="title"><a href="./index.php">L<i>eed</i></a></h1>
+            <h1 class="logo" id="title"><a href="./">L<i>eed</i></a></h1>
             <nav>
             </nav>
         </header>
diff --git a/templates/marigolds/header.html b/templates/marigolds/header.html
index 920121f8..c5420d7b 100644
--- a/templates/marigolds/header.html
+++ b/templates/marigolds/header.html
@@ -24,7 +24,7 @@
         <a id="pageTop" class="hidden">{$action}</a>
         <div id="header-container">
             <header class="wrapper clearfix">
-                <h1 class="logo" id="title"><a href="./index.php">L<i>eed</i></a><div class="versionBloc">{#LEED_VERSION_NUMBER#}&nbsp;{#LEED_VERSION_NAME#}</div></h1>
+                <h1 class="logo" id="title"><a href="./">L<i>eed</i></a><div class="versionBloc">{#LEED_VERSION_NUMBER#}&nbsp;{#LEED_VERSION_NAME#}</div></h1>
                 <div class="loginBloc">
                     {if="!$myUser"}
                     {if="@$wrongLogin"}
@@ -53,8 +53,8 @@ <h1 class="logo" id="title"><a href="./index.php">L<i>eed</i></a><div class="ver
 
                 <nav>
                     <ul>
-                        <li><a href="index.php" title="{function="_t('HOME')"}"><i class="icon-home"></i></a></li>
-                        <li><a href="index.php?action=favorites" title="{function="_t('FAVORITES')"}"><i class="icon-star-empty"></i></a></li>
+                        <li><a href="./" title="{function="_t('HOME')"}"><i class="icon-home"></i></a></li>
+                        <li><a href="./?action=favorites" title="{function="_t('FAVORITES')"}"><i class="icon-star-empty"></i></a></li>
                         <li><a href="settings.php" title="{function="_t('MANAGE')"}"><i class="icon-cog"></i></a></li>
                         <li><a class="synchronyzeButton" title="{function="_t('LAUNCH_SYNCHRONISATION')"}" onclick="synchronize('{if="$myUser"}{$synchronisationCode}{/if}');"><i class="icon-arrows-cw"></i></a></li>
                         {function="Plugin::callHook("navigate_post_link", array(&$myUser))"}
diff --git a/templates/marigolds/index.html b/templates/marigolds/index.html
index 27f5a82b..4b1ee22d 100644
--- a/templates/marigolds/index.html
+++ b/templates/marigolds/index.html
@@ -59,7 +59,7 @@ <h3 class="left">{function="_t('FEED')"}</h3> <button style="margin: 10px 0px 0p
                     <li>
                         <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnlyUnreadFeedFolder=='true' && $unreadEventsForFolder==0"} style="display:none;"{/if}>
                             {function="Plugin::callHook("menu_pre_folder_link", array(&$value))"}
-                            <a  title="{function="_t('READ_FOLDER_ITEMS')"}" class="folderLink" href="index.php?action=selectedFolder&amp;folder={$value->getId()}" data-id="{$value->getId()}">{$value->getName()}</a> <a class="readFolder" title="{function="_t('FOLD_UNFOLD_FOLDER')"}" onclick="toggleFolder(this,{$value->getId()});" >{if="!$value->getIsopen()"}<i class="icon-folder-empty"></i>{else}<i class="icon-folder-open-empty"></i>{/if}</a> {if="$unreadEventsForFolder!=0"}<a class="unreadForFolder"  title="{function="_t('MARK_AS_READ_FOLDER_ITEMS',array($unreadEventsForFolder))"}" data-mark-all-read="folder">{$unreadEventsForFolder} {function="_t('UNREAD')"}</a>{/if}
+                            <a  title="{function="_t('READ_FOLDER_ITEMS')"}" class="folderLink" href="./?action=selectedFolder&amp;folder={$value->getId()}" data-id="{$value->getId()}">{$value->getName()}</a> <a class="readFolder" title="{function="_t('FOLD_UNFOLD_FOLDER')"}" onclick="toggleFolder(this,{$value->getId()});" >{if="!$value->getIsopen()"}<i class="icon-folder-empty"></i>{else}<i class="icon-folder-open-empty"></i>{/if}</a> {if="$unreadEventsForFolder!=0"}<a class="unreadForFolder"  title="{function="_t('MARK_AS_READ_FOLDER_ITEMS',array($unreadEventsForFolder))"}" data-mark-all-read="folder">{$unreadEventsForFolder} {function="_t('UNREAD')"}</a>{/if}
                             {function="Plugin::callHook("menu_post_folder_link", array(&$value))"}
                         </h1>
                         <!-- FLUX DU DOSSIER -->
@@ -75,7 +75,7 @@ <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnl
                                                 {else}
                                                 <li class="errorSync" title="{function="_t('SYNCHRONISATION_ERROR')"}">
                                                 {/if}
-                                                    {function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}                                             <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
+                                                    {function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}                                             <a href="./?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
                                                     <button class="right unreadForFeed" data-mark-all-read="feed">
                                                         <span title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
                                                     </button>
@@ -88,7 +88,7 @@ <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnl
                                                     {else}
                                                     <li class="hidefeed errorSync" style="display:none;" title="{function="_t('SYNCHRONISATION_ERROR')"}">
                                                     {/if}
-                                                    {function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}                                             <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
+                                                    {function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}                                             <a href="./?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
                                                     {if="isset($unread[$value2['id']])"}
                                                     <button class="right unreadForFeed" data-mark-all-read="feed">
                                                     <span title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
@@ -112,7 +112,7 @@ <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnl
                                                 <li class="hidefeed errorSync" title="{function="_t('SYNCHRONISATION_ERROR')"}">
                                                 {/if}
                                             {/if}
-                                                {function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}                                             <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
+                                                {function="Plugin::callHook("menu_pre_feed_link", array(&$value))"}                                             <a href="./?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
                                                 {if="isset($unread[$value2['id']])"}
                                                     <button class="right unreadForFeed" data-mark-all-read="feed">
                                                         <span title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
@@ -153,8 +153,8 @@ <h1 class="articleSection"><a target="_blank" rel="noopener noreferrer" href="{$
                    
                         {$currentFeed->getDescription()} <div class="clear"></div>
                             {function="_t('SEE_THE')"}
-                    <a href="index.php?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=unread">{function="ucfirst(_t('UNREAD'))"}</a> |
-                    <a href="index.php?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=older">{function="_t('OLDER')"}</a> {function="_t('IN_FIRST')"}
+                    <a href="./?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=unread">{function="ucfirst(_t('UNREAD'))"}</a> |
+                    <a href="./?action=selectedFeed&amp;feed={$_['feed']}&amp;page={$page}&amp;order=older">{function="_t('OLDER')"}</a> {function="_t('IN_FIRST')"}
                 {/if}
 
                 {if="$action=='selectedFolder'"}
diff --git a/templates/marigolds/settings.html b/templates/marigolds/settings.html
index 3855a3be..694503bc 100644
--- a/templates/marigolds/settings.html
+++ b/templates/marigolds/settings.html
@@ -99,7 +99,7 @@ <h1 class="folder left" ><span>{$value->getName()}</span> ({function="count($fee
                                 {$feedName=Functions::truncate($value2->getName(),40)}
                                 <li class="feedListItem{if="$value->getLastSyncInError()==1"} errorSync{/if}">
                                     <span class="feedTitle js-feedTitle"{if="$value->getLastSyncInError()==1"} title="{function="_t('SYNCHRONISATION_ERROR')"}"{/if}>
-                                        <a{if="$value->getLastSyncInError()==1"} class="inError"{/if} href="index.php?action=selectedFeed&feed={$value2->getId();}" data-feed-id="{$value2->getId()}">{$feedName}</a><a href="{$value2->getUrl()}" class="underlink">{$value2->getUrl()}</a>
+                                        <a{if="$value->getLastSyncInError()==1"} class="inError"{/if} href="?action=selectedFeed&feed={$value2->getId();}" data-feed-id="{$value2->getId()}">{$feedName}</a><a href="{$value2->getUrl()}" class="underlink">{$value2->getUrl()}</a>
                                     </span>
                                     <div class="feedAction">
                                         <select class="feedFolder" onchange="changeFeedFolder(this,{$value2->getId()});">