From 4c1d4f5cb2921ca10665295657e845774c486941 Mon Sep 17 00:00:00 2001
From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Fri, 25 May 2012 17:13:07 +0900
Subject: [PATCH] Fix Notice errors.

---
 templates/help/en/queryCache.tpl | 16 +++++++++++++---
 templates/help/ja/queryCache.tpl | 14 +++++++++++---
 templates/queryCache.tpl         | 32 ++++++++++++++++++++++++++++----
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/templates/help/en/queryCache.tpl b/templates/help/en/queryCache.tpl
index f3974d5..36de7ca 100644
--- a/templates/help/en/queryCache.tpl
+++ b/templates/help/en/queryCache.tpl
@@ -21,19 +21,27 @@
 	<p>It is possible to search for the data that exists in the query cache. It searches for the query string and the database name, and it processes it by the partial agreement retrieval. It becomes a search for the logical product with the query string and the database name. 
     <table>
       <tbody>
-        <tr> {if $deleteRow > 0}
+        <tr> {if isset($deleteRow) && $deleteRow > 0}
         <tr>
           <td colspan="5">{$deleteRow|escape}{$message.strDeleted|escape}</td>
         </tr>
       {/if}
       <tr>
         <td nowrap="nowrap" class="column">{$message.strQueryStr|escape}</td>
-        <td><input name="qQueryStr" type="text" id="qQueryStr" size="50" value="{$qQueryStr|escape}"/>
+        <td>{if isset($qQueryStr)}
+            <input name="qQueryStr" type="text" id="qQueryStr" size="50" value="{$qQueryStr|escape}"/>
+            {else}
+            <input name="qQueryStr" type="text" id="qQueryStr" size="50" value=""/>
+            {/if}
         </td>
       </tr>
       <tr>
         <td nowrap="nowrap" class="column">{$message.strDb|escape}</td>
-        <td><input name="qDb" type="text" id="qDb" size="50" value="{$qDb|escape}"/></td>
+        <td>{if isset($qDb)}
+            <input name="qDb" type="text" id="qDb" size="50" value="{$qDb|escape}"/></td>
+            {else}
+            <input name="qDb" type="text" id="qDb" size="50" value=""/></td>
+            {/if}
       </tr>
       </tbody>
       <tfoot>
@@ -56,6 +64,7 @@ The query string, database name and create time which existing in cache is displ
           <th>{$message.strDb|escape}</th>
           <th>{$message.strCreateTime|escape}</th>
         </tr>
+      {if isset($queryCache)}
       {foreach name=querycache from=$queryCache item=cache}
       {if $smarty.foreach.querycache.iteration % 2 == 0}
       <tr class="even">
@@ -68,6 +77,7 @@ The query string, database name and create time which existing in cache is displ
         <td>{$cache.create_time|escape}</td>
       </tr>
       {/foreach}
+      {/if}
       </tbody>
       <tfoot>
       <tr><td colspan="4">
diff --git a/templates/help/ja/queryCache.tpl b/templates/help/ja/queryCache.tpl
index cda276a..66e12ea 100644
--- a/templates/help/ja/queryCache.tpl
+++ b/templates/help/ja/queryCache.tpl
@@ -21,19 +21,27 @@
 	<p>クエリキャッシュのデータを検索することができます。検索対象は、クエリ文字列とデータベース名で、部分一致検索を行うことができます。クエリ文字列とデータベース名はAND検索になります。</p>
     <table>
       <tbody>
-        <tr> {if $deleteRow > 0}
+        <tr> {if isset($deleteRow) && $deleteRow > 0}
         <tr>
           <td colspan="5">{$deleteRow|escape}{$message.strDeleted|escape}</td>
         </tr>
       {/if}
       <tr>
         <td nowrap="nowrap" class="column">{$message.strQueryStr|escape}</td>
-        <td><input name="qQueryStr" type="text" id="qQueryStr" size="50" value="{$qQueryStr|escape}"/>
+        <td>{if isset($qQueryStr)}
+            <input name="qQueryStr" type="text" id="qQueryStr" size="50" value="{$qQueryStr|escape}"/>
+            {else}
+            <input name="qQueryStr" type="text" id="qQueryStr" size="50" value=""/>
+            {/if}
         </td>
       </tr>
       <tr>
         <td nowrap="nowrap" class="column">{$message.strDb|escape}</td>
-        <td><input name="qDb" type="text" id="qDb" size="50" value="{$qDb|escape}"/></td>
+        <td>{if isset($qDb)}
+            <input name="qDb" type="text" id="qDb" size="50" value="{$qDb|escape}"/></td>
+            {else}
+            <input name="qDb" type="text" id="qDb" size="50" value=""/></td>
+            {/if}
       </tr>
       </tbody>
       <tfoot>
diff --git a/templates/queryCache.tpl b/templates/queryCache.tpl
index 30887cc..2831ae6 100644
--- a/templates/queryCache.tpl
+++ b/templates/queryCache.tpl
@@ -43,7 +43,7 @@ function sendAction(action) {
       </td></tr>
       </tfoot>
       <tbody>
-        {if $deleteRow > 0}
+        {if isset($deleteRow) && $deleteRow > 0}
         <tr>
           <td colspan="5">{$deleteRow|escape}{$message.strDeleted|escape}</td>
         </tr>
@@ -69,9 +69,33 @@ function sendAction(action) {
       <tbody>
         <tr>
           <th><input type="checkbox" name="all" onclick="checkboxChange(this)" value="" /></th>
-          <th> {if $col == "query" && $sort == "ascending"} <a href="queryCache.php?col=query&sort=descending"><img src="images/ascending.gif" alt="ascending" />{$message.strQueryStr|escape}</a> {elseif $col == "query" && $sort == "descending"} <a href="queryCache.php?col=query&sort=ascending"><img src="images/descending.gif" alt="descending" />{$message.strQueryStr|escape}</a> {else} <img src="images/spacer.gif" width="8" height="8" alt="spacer" /><a href="queryCache.php?col=query&sort=ascending">{$message.strQueryStr|escape}</a> {/if} </th>
-          <th> {if $col == "dbname" && $sort == "ascending"} <a href="queryCache.php?col=dbname&sort=descending"><img src="images/ascending.gif" alt="ascending" />{$message.strDb|escape}</a> {elseif $col == "dbname" && $sort == "descending"} <a href="queryCache.php?col=dbname&sort=ascending"><img src="images/descending.gif" alt="descending" />{$message.strDb|escape}</a> {else} <img src="images/spacer.gif" width="8" height="8" alt="spacer" /><a href="queryCache.php?col=dbname&sort=ascending">{$message.strDb|escape}</a> {/if} </th>
-          <th> {if $col == "create_time" && $sort == "ascending"} <a href="queryCache.php?col=create_time&sort=descending"><img src="images/ascending.gif" alt="ascending" />{$message.strCreateTime|escape}</a> {elseif $col == "create_time" && $sort == "descending"} <a href="queryCache.php?col=create_time&sort=ascending"><img src="images/descending.gif" alt="descending" />{$message.strCreateTime|escape}</a> {else} <img src="images/spacer.gif" width="8" height="8" alt="spacer" /><a href="queryCache.php?col=create_time&sort=ascending">{$message.strCreateTime|escape}</a> {/if} </th>
+          <th>
+          {if $col == "query" && $sort == "ascending"}
+          <a href="queryCache.php?col=query&sort=descending"><img src="images/ascending.gif" alt="ascending" />{$message.strQueryStr|escape}</a>
+          {elseif $col == "query" && $sort == "descending"}
+          <a href="queryCache.php?col=query&sort=ascending"><img src="images/descending.gif" alt="descending" />{$message.strQueryStr|escape}</a>
+          {else}
+          <img src="images/spacer.gif" width="8" height="8" alt="spacer" /><a href="queryCache.php?col=query&sort=ascending">{$message.strQueryStr|escape}</a>
+          {/if}
+          </th>
+          <th>
+          {if $col == "dbname" && $sort == "ascending"}
+          <a href="queryCache.php?col=dbname&sort=descending"><img src="images/ascending.gif" alt="ascending" />{$message.strDb|escape}</a>
+          {elseif $col == "dbname" && $sort == "descending"}
+          <a href="queryCache.php?col=dbname&sort=ascending"><img src="images/descending.gif" alt="descending" />{$message.strDb|escape}</a>
+          {else}
+          <img src="images/spacer.gif" width="8" height="8" alt="spacer" /><a href="queryCache.php?col=dbname&sort=ascending">{$message.strDb|escape}</a>
+          {/if}
+          </th>
+          <th>
+          {if $col == "create_time" && $sort == "ascending"}
+          <a href="queryCache.php?col=create_time&sort=descending"><img src="images/ascending.gif" alt="ascending" />{$message.strCreateTime|escape}</a>
+          {elseif $col == "create_time" && $sort == "descending"}
+          <a href="queryCache.php?col=create_time&sort=ascending"><img src="images/descending.gif" alt="descending" />{$message.strCreateTime|escape}</a>
+          {else}
+          <img src="images/spacer.gif" width="8" height="8" alt="spacer" /><a href="queryCache.php?col=create_time&sort=ascending">{$message.strCreateTime|escape}</a>
+          {/if}
+          </th>
         </tr>
       {foreach name=querycache from=$queryCache item=cache}
       {if $smarty.foreach.querycache.iteration % 2 == 0}
-- 
2.39.5