Rename configuration keys and fix GLOBALS in templates

4 files changed, 5 insertions, 7 deletions

diff --git a/tpl/configure.html b/tpl/configure.html
index f99fa45b..ad9a2085 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -36,7 +36,7 @@
         <td><b>Security:</b></td>
         <td>
           <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection"
-                   {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}>
+                   {if="$private_links_default"}checked{/if}>
           <label
             for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get
             disconnected often or if your IP address changes often.)</label>
@@ -60,7 +60,7 @@
                  {if="$enable_rss_permalinks"}checked{/if}/>
           <label for="enableRssPermalinks">
             &nbsp;Disable it to use permalinks in RSS feed instead of direct links to your shaared links. Currently <b>
-            {if="$GLOBALS['config']['ENABLE_RSS_PERMALINKS']"}enabled{else}disabled{/if}.</b>
+            {if="$enable_rss_permalinks"}enabled{else}disabled{/if}.</b>
           </label>
         </td>
       </tr>
diff --git a/tpl/daily.html b/tpl/daily.html
index 063dc89a..dde1f376 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -53,7 +53,7 @@
                                 <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
                             </a>
                         </div>
-                        {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
+                        {if="!$hide_timestamps || isLoggedIn()"}
                             <div class="dailyEntryLinkdate">
                                 <a href="?{$link.linkdate|smallHash}">{function="strftime('%c', $link.timestamp)"}</a>
                             </div>
diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html
index 4133ca3e..b14a3859 100644
--- a/tpl/dailyrss.html
+++ b/tpl/dailyrss.html
@@ -6,7 +6,7 @@
     <description><![CDATA[
         {loop="links"}
                 <h3><a href="{$value.url}">{$value.title}</a></h3>
-                <small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
+                <small>{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
                 {$value.url}</small><br>
                 {if="$value.thumbnail"}{$value.thumbnail}{/if}<br>
                 {if="$value.description"}{$value.formatedDescription}{/if}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 14a2e6c8..441b5302 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -25,7 +25,7 @@
                 {$value}
             {/loop}
 
-                {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
+                {if="($link_is_new && $default_private_links) || $link.private == true"}
             <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
             &nbsp;<label for="lf_private"><i>Private</i></label><br>
             {else}
@@ -43,12 +43,10 @@
 {if="$source !== 'firefoxsocialapi'"}
 {include="page.footer"}
 {/if}
-{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"}
 <script src="inc/awesomplete.min.js#"></script>
 <script src="inc/awesomplete-multiple-tags.js#"></script>
 <script>
     awesompleteUniqueTag('#lf_tags');
 </script>
-{/if}
 </body>
 </html>