From 9aeb0052014cd72871b454f63995eda80e8748df Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sat, 6 Jul 2013 18:10:23 +0200
Subject: [PATCH] Adding `{nocache}` flags for dynamic content

This will update content instantly once the user changes it and not load
a cached version from the smarty cache.

Addresses #309
---
 public/templates/mmcFE/account/edit/default.tpl        | 10 +++++-----
 .../templates/mmcFE/account/notifications/default.tpl  |  8 ++++----
 public/templates/mmcFE/account/workers/default.tpl     |  2 ++
 public/templates/mmcFE/admin/news/default.tpl          |  2 ++
 public/templates/mmcFE/admin/news_edit/default.tpl     |  6 +++---
 public/templates/mmcFE/admin/settings/default.tpl      |  4 ++--
 public/templates/mmcFE/admin/user/default.tpl          |  2 ++
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/public/templates/mmcFE/account/edit/default.tpl b/public/templates/mmcFE/account/edit/default.tpl
index 482c3579..c15b56d4 100644
--- a/public/templates/mmcFE/account/edit/default.tpl
+++ b/public/templates/mmcFE/account/edit/default.tpl
@@ -7,9 +7,9 @@
         <tbody><tr><td>Username: </td><td>{$GLOBAL.userdata.username}</td></tr>
         <tr><td>User Id: </td><td>{$GLOBAL.userdata.id}</td></tr>
         <tr><td>API Key: </td><td><a href="{$smarty.server.PHP_SELF}?page=api&action=getuserstatus&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}">{$GLOBAL.userdata.api_key}</a></td></tr>
-        <tr><td>E-Mail: </td><td><input type="text" name="email" value="{$GLOBAL.userdata.email|escape}" size="20"></td></tr>
-        <tr><td>Payment Address: </td><td><input type="text" name="paymentAddress" value="{$smarty.request.paymentAddress|default:$GLOBAL.userdata.coin_address|escape}" size="40"></td></tr>
-        <tr><td>Donation %: </td><td><input type="text" name="donatePercent" value="{$smarty.request.donatePercent|default:$GLOBAL.userdata.donate_percent|escape}" size="4"><font size="1"> [donation amount in percent (example: 0.5)]</font></td></tr>
+        <tr><td>E-Mail: </td><td><input type="text" name="email" value="{nocache}{$GLOBAL.userdata.email|escape}{/nocache}" size="20"></td></tr>
+        <tr><td>Payment Address: </td><td><input type="text" name="paymentAddress" value="{nocache}{$smarty.request.paymentAddress|default:$GLOBAL.userdata.coin_address|escape}{nocache}" size="40"></td></tr>
+        <tr><td>Donation %: </td><td><input type="text" name="donatePercent" value="{nocache}{$smarty.request.donatePercent|default:$GLOBAL.userdata.donate_percent|escape}{nocache}" size="4"><font size="1"> [donation amount in percent (example: 0.5)]</font></td></tr>
         <tr><td>Automatic Payout Threshold: </td><td valign="top"><input type="text" name="payoutThreshold" value="{$smarty.request.payoutThreshold|default:$GLOBAL.userdata.ap_threshold|escape}" size="5" maxlength="5"> <font size="1">[{$GLOBAL.config.ap_threshold.min}-{$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout]</font></td></tr>
         <tr><td>4 digit PIN: </td><td><input type="password" name="authPin" size="4" maxlength="4"><font size="1"> [The 4 digit PIN you chose when registering]</font></td></tr>
       </tbody></table>
@@ -23,8 +23,8 @@
       <input type="hidden" name="action" value="{$smarty.request.action|escape}">
       <input type="hidden" name="do" value="cashOut">
       <table>
-        <tbody><tr><td>Account Balance: &nbsp;&nbsp;&nbsp;</td><td>{$GLOBAL.userdata.balance.confirmed|escape} {$GLOBAL.config.currency}</td></tr>
-        <tr><td>Payout to: </td><td><h6>{$GLOBAL.userdata.coin_address|escape}</h6></td></tr>
+        <tbody><tr><td>Account Balance: &nbsp;&nbsp;&nbsp;</td><td>{nocache}{$GLOBAL.userdata.balance.confirmed|escape}{/nocache} {$GLOBAL.config.currency}</td></tr>
+        <tr><td>Payout to: </td><td><h6>{nocache}{$GLOBAL.userdata.coin_address|escape}{/nocache}</h6></td></tr>
         <tr><td>4 digit PIN: </td><td><input type="password" name="authPin" size="4" maxlength="4"></td></tr>
       </tbody></table>
       <input type="submit" class="submit mid" value="Cash Out"></form>
diff --git a/public/templates/mmcFE/account/notifications/default.tpl b/public/templates/mmcFE/account/notifications/default.tpl
index 1d54729b..52140466 100644
--- a/public/templates/mmcFE/account/notifications/default.tpl
+++ b/public/templates/mmcFE/account/notifications/default.tpl
@@ -12,7 +12,7 @@
     <td class="left">IDLE Worker</td>
     <td class="center">
       <input type="hidden" name="data[idle_worker]" value="0" />
-      <input type="checkbox" name="data[idle_worker]" id="data[idle_worker]" value="1"{if $SETTINGS['idle_worker']}checked{/if} />
+      <input type="checkbox" name="data[idle_worker]" id="data[idle_worker]" value="1"{nocache}{if $SETTINGS['idle_worker']}checked{/if}{/nocache} />
       <label for="data[idle_worker]"></label>
     </td>
   </tr>
@@ -20,7 +20,7 @@
     <td class="left">New Blocks</td>
     <td class="center">
       <input type="hidden" name="data[new_block]" value="0" />
-      <input type="checkbox" name="data[new_block]" id="data[new_block]" value="1"{if $SETTINGS['new_block']}checked{/if} />
+      <input type="checkbox" name="data[new_block]" id="data[new_block]" value="1"{nocache}{if $SETTINGS['new_block']}checked{/if}{/nocache} />
       <label for="data[new_block]"></label>
     </td>
   </tr>
@@ -28,7 +28,7 @@
     <td class="left">Auto Payout</td>
     <td class="center">
       <input type="hidden" name="data[auto_payout]" value="0" />
-      <input type="checkbox" name="data[auto_payout]" id="data[auto_payout]" value="1"{if $SETTINGS['auto_payout']}checked{/if} />
+      <input type="checkbox" name="data[auto_payout]" id="data[auto_payout]" value="1"{nocache}{if $SETTINGS['auto_payout']}checked{/if}{/nocache} />
       <label for="data[auto_payout]"></label>
     </td>
   </tr>
@@ -36,7 +36,7 @@
     <td class="left">Manual Payout</td>
     <td class="center">
       <input type="hidden" name="data[manual_payout]" value="0" />
-      <input type="checkbox" name="data[manual_payout]" id="data[manual_payout]" value="1"{if $SETTINGS['manual_payout']}checked{/if} />
+      <input type="checkbox" name="data[manual_payout]" id="data[manual_payout]" value="1"{nocache}{if $SETTINGS['manual_payout']}checked{/if}{/nocache} />
       <label for="data[manual_payout]"></label>
     </td>
   </tr>
diff --git a/public/templates/mmcFE/account/workers/default.tpl b/public/templates/mmcFE/account/workers/default.tpl
index c69d1139..f26e3109 100644
--- a/public/templates/mmcFE/account/workers/default.tpl
+++ b/public/templates/mmcFE/account/workers/default.tpl
@@ -15,6 +15,7 @@
         <td>&nbsp;</td>
         <td>&nbsp;</td>
       </tr>
+      {nocache}
       {section worker $WORKERS}
       {assign var="username" value="."|escape|explode:$WORKERS[worker].username:2} 
       <tr>
@@ -29,6 +30,7 @@
         <td align="right"><a href="{$smarty.server.PHP_SELF}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&do=delete&id={$WORKERS[worker].id|escape}"><button style="padding:5px" type="button">Delete</button></a></td>
       </tr>
       {/section}
+      {/nocache}
       </tbody>
     </table>
     <input type="submit" value="Update Workers" style="padding:5px">
diff --git a/public/templates/mmcFE/admin/news/default.tpl b/public/templates/mmcFE/admin/news/default.tpl
index 7bd8c198..8c3ac5d1 100644
--- a/public/templates/mmcFE/admin/news/default.tpl
+++ b/public/templates/mmcFE/admin/news/default.tpl
@@ -17,6 +17,7 @@
   </table>
 </form>
 {include file="global/block_footer.tpl"}
+{nocache}
 {section name=news loop=$NEWS}
 {include
   file="global/block_header.tpl"
@@ -35,4 +36,5 @@
 </form>
 {include file="global/block_footer.tpl"}
 {/section}
+{/nocache}
 {include file="global/block_footer.tpl"}
diff --git a/public/templates/mmcFE/admin/news_edit/default.tpl b/public/templates/mmcFE/admin/news_edit/default.tpl
index 467d4a6c..22e945fb 100644
--- a/public/templates/mmcFE/admin/news_edit/default.tpl
+++ b/public/templates/mmcFE/admin/news_edit/default.tpl
@@ -10,7 +10,7 @@
         Active
       </th>
       <td>
-        <input type="checkbox" name="active" value="1" id="active" {if $NEWS.active}checked{/if} />
+        <input type="checkbox" name="active" value="1" id="active" {nocache}{if $NEWS.active}checked{/if}{/nocache} />
         <label for="active"></label>
       </td>
     </tr>
@@ -18,13 +18,13 @@
       <th>
         Header
       </th>
-      <td><input name="header" type="text" size="30" value="{$NEWS.header}" required /></td>
+      <td><input name="header" type="text" size="30" value="{nocache}{$NEWS.header}{/nocache}" required /></td>
     </tr>
     <tr>
       <th>
         Content
       </th>
-      <td><textarea name="content" rows="500" type="text" required>{$NEWS.content}</textarea></td>
+      <td><textarea name="content" rows="500" type="text" required>{nocache}{$NEWS.content}{/nocache}</textarea></td>
     </tr>
   </table>
   <input type="submit" value="Save" class="submit small" />
diff --git a/public/templates/mmcFE/admin/settings/default.tpl b/public/templates/mmcFE/admin/settings/default.tpl
index 3cd67f4e..a2ffbd5b 100644
--- a/public/templates/mmcFE/admin/settings/default.tpl
+++ b/public/templates/mmcFE/admin/settings/default.tpl
@@ -16,7 +16,7 @@
         <td>
           <select name="data[maintenance]">
             <option value="1">Yes</option>
-            <option value="0"{if !$MAINTENANCE} selected{/if}>No</option>
+            <option value="0"{nocache}{if !$MAINTENANCE} selected{/if}>{/nocache}No</option>
           </select>
         </td>
       </tr>
@@ -26,7 +26,7 @@
         <td>
           <select name="data[lock_registration]">
             <option value="1">Yes</option>
-            <option value="0"{if !$LOCKREGISTRATION} selected{/if}>No</option>
+            <option value="0"{nocache}{if !$LOCKREGISTRATION} selected{/if}{/nocache}>No</option>
           </select>
         </td>
       </tr>
diff --git a/public/templates/mmcFE/admin/user/default.tpl b/public/templates/mmcFE/admin/user/default.tpl
index 82955741..8c65c49f 100644
--- a/public/templates/mmcFE/admin/user/default.tpl
+++ b/public/templates/mmcFE/admin/user/default.tpl
@@ -44,6 +44,7 @@
     </tr>
   </thead>
   <tbody>
+{nocache}
 {section name=user loop=$USERS|default}
     <tr>
       <td class="center">{$USERS[user].id}</td>
@@ -70,6 +71,7 @@
     <td colspan="10"></td>
   </tr>
 {/section}
+{/nocache}
   </tbody>
   <tfoot>
     <tr>