Ticket処理を追加

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@458 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/trunk/NP_TrackBack/NP_TrackBack.php b/trunk/NP_TrackBack/NP_TrackBack.php
index 0c51d6e..35bb2bf 100644 (file)
--- a/trunk/NP_TrackBack/NP_TrackBack.php
+++ b/trunk/NP_TrackBack/NP_TrackBack.php
@@ -300,7 +300,7 @@
                                                return $err;
                                        header('Location: ' . serverVar('HTTP_REFERER'));
                                        break;
-                       }
+                       } 
 
                        exit;
                } 
@@ -1770,8 +1770,7 @@
                /* Internal helper functions for dealing with external file retrieval                 */
        
                function retrieveUrl ($url) {
-//mod by cles
-                       $ua = ini_set('user_agent', 'NP_TrackBack/'. $this->getVersion());
+//mod by cles\r                 $ua = ini_set('user_agent', 'NP_TrackBack/'. $this->getVersion());
 //mod by cles end
                        if (function_exists('curl_init') && $this->useCurl > 0)
                        {
@@ -2478,8 +2477,7 @@ function _cut_string($string, $dl = 0) {
        return $string;
 }
 
-function _strip_controlchar($string){
-       $string = preg_replace("/[\x01-\x08\x0b\x0c\x0e-\x1f\x7f]+/","",$string);
+function _strip_controlchar($string){\r $string = preg_replace("/[\x01-\x08\x0b\x0c\x0e-\x1f\x7f]+/","",$string);
        $string = str_replace("\0","",$string);
        return $string;
 }

diff --git a/trunk/NP_TrackBack/trackback/index.php b/trunk/NP_TrackBack/trackback/index.php
index 5e5556f..a6103b1 100644 (file)
--- a/trunk/NP_TrackBack/trackback/index.php
+++ b/trunk/NP_TrackBack/trackback/index.php
@@ -24,6 +24,14 @@
                exit;
        }
        
+       // Actions
+       $action = requestVar('action');
+       $aActionsNotToCheck = array(
+               '',
+       );
+       if (!in_array($action, $aActionsNotToCheck)) {
+               if (!$manager->checkTicket()) doError(_ERROR_BADTICKET);
+       }
        $oPluginAdmin->start();
        
 //modify start+++++++++
@@ -47,9 +55,6 @@
        $oTemplate = new Trackback_Template();
        $oTemplate->set ('CONF', $CONF);
 
-       // Actions
-       $action = requestVar('action');
-
        switch($action) {
 
 //modify start+++++++++

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.help.html b/trunk/NP_TrackBack/trackback/japanese-euc.help.html
index 47f0fcb..45d5c68 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.help.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.help.html
@@ -127,7 +127,7 @@ div.tb div.info {
 <ul>
        <li>Version 2.0.3jp7 : (2006/*/*)</li>
        <li>¡¡[Changed] SpamChek¤Ë¤Ä¤¤¤ÆÈùÄ´À°</li>
-       <li>¡¡[Fixed] ¥»¥­¥å¥ê¥Æ¥£¤Î¸þ¾å(ticket½èÍý¤ÎÄɲá£CSRFÂкö)</li>
+       <li>¡¡[Added] Ticket½èÍý¤òÄɲÃ(CSRFÂкö)</li>
        
        <li>Version 2.0.3jp6 : (2006/09/30)</li>
        <li>¡¡[Fixed] ¥»¥­¥å¥ê¥Æ¥£¤Î¸þ¾å</li>

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/all.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/all.html
index 006df11..2727ecd 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/all.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/all.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        All trackbacks
        <?php if ($count > $amount): ?>
@@ -16,6 +17,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -27,6 +29,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -59,13 +62,13 @@
                                <?php echo str_replace(' ', '&nbsp;', date("Y-m-d @ H:i",$item['timestamp']));?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=block&amp;tb=<?php echo $item['id'];?>&amp;next=all&amp;start=<?php echo $start;?>'>Block</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=block&tb='.$item['id'].'&next=all&start='.$start),ENT_QUOTES);?>">Block</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=all&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=all&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -82,6 +85,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -93,6 +97,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -100,5 +105,4 @@
        </tr>
 </table>
 <?php endif; ?>
-<?php endif; ?>
-
+<?php endif; ?>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/blocked.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/blocked.html
index 1388181..a4882b6 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/blocked.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/blocked.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        ¥Ö¥í¥Ã¥¯¤µ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯
        <?php if ($count > $amount): ?>
@@ -6,8 +7,8 @@
 </h2>
 
 <ul>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked_clear&amp;next=blocked'>¥Ö¥í¥Ã¥¯¤µ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¤Î¥¯¥ê¥¢</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked_spamclear&amp;next=blocked'>spamȽÄꤵ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¤Î¥¯¥ê¥¢</a></li> 
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked_clear&next=blocked'),ENT_QUOTES); ?>">¥Ö¥í¥Ã¥¯¤µ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¤Î¥¯¥ê¥¢</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked_spamclear&next=blocked'),ENT_QUOTES); ?>">spamȽÄꤵ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¤Î¥¯¥ê¥¢</a></li> 
 </ul>
 
 <?php if(count($items)): ?>
@@ -21,6 +22,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -32,6 +34,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -76,13 +79,13 @@
                                        '<span style="color: darkred;">No</span>';?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=unblock&amp;tb=<?php echo $item['id'];?>&amp;next=blocked&amp;start=<?php echo $start;?>'>Unblock</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=unblock&tb='.$item['id'].'&next=blocked&start='.$start),ENT_QUOTES);?>">Unblock</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=blocked&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=blocked&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -99,6 +102,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -110,6 +114,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/form.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/form.html
index 2b7e535..97b01d2 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/form.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/form.html
@@ -25,7 +25,7 @@
                        <input type="hidden" name="action" value="plugin" />
                        <input type="hidden" name="name" value="TrackBack" />
                        <input type="hidden" name="type" value="ping" />
-
+                       
                        <table>
                                <tr>
                                        <td>¤¢¤Ê¤¿¤Îµ­»ö¤Îurl</td>

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/index.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/index.html
index 79a1acf..15a2ce4 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/index.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/index.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>Overview of all items</h2>
 
 <?php if(count($blogs)): ?>
@@ -22,7 +23,7 @@
                                <?php echo htmlspecialchars($item['total']);?>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=list&amp;id=<?php echo $item['inumber'];?>'>Trackbacks</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=list&id='.$item['inumber']),ENT_QUOTES);?>">Trackbacks</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -30,6 +31,4 @@
 <?php endif; ?>
 <?php endwhile; ?>
 </table>
-<?php endif; ?>
-
-
+<?php endif; ?>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/list.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/list.html
index 9d9fd42..14f05f8 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/list.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/list.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        All trackbacks for &quot;<?php echo $story['title'];?>&quot;
        <?php if ($count > $amount): ?>
@@ -17,6 +18,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -29,6 +31,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -57,13 +60,13 @@
                                <?php echo str_replace(' ', '&nbsp;', date("Y-m-d @ H:i",$item['timestamp']));?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=block&amp;tb=<?php echo $item['id'];?>&amp;next=list&amp;id=<?php echo $story['id'];?>&amp;start=<?php echo $start;?>'>Block</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=block&tb='.$item['id'].'&next=list&id='.$story['id'].'&start='.$start),ENT_QUOTES);?>">Block</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=list&amp;id=<?php echo $story['id'];?>&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=list&id='.$story['id'].'&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -81,6 +84,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -93,6 +97,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/menu.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/menu.html
index 1805dcd..0c3a6fa 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/menu.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/menu.html
@@ -1,11 +1,11 @@
-
+<?php global $manager; ?>
 <h2>Trackback</h2>
 
 <ul>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=index'>Overview of all items</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=all'>¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¤ÎÁ´¥Ç¡¼¥¿</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked'>¥Ö¥í¥Ã¥¯¤µ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯</a></li> 
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=ping'>¼êÆ°ping</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=help'>¥Ø¥ë¥×</a></li>
-    <li><a href='<?php echo $CONF['AdminURL'];?>index.php?action=pluginoptions&amp;plugid=<?php echo $plugid;?>'>¥×¥é¥°¥¤¥ó¥ª¥×¥·¥ç¥óÀßÄê</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=index'),ENT_QUOTES);?>">Overview of all items</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=all'),ENT_QUOTES);?>">¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¤ÎÁ´¥Ç¡¼¥¿</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked'),ENT_QUOTES);?>">¥Ö¥í¥Ã¥¯¤µ¤ì¤¿¥È¥é¥Ã¥¯¥Ð¥Ã¥¯</a></li> 
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=ping'),ENT_QUOTES);?>">¼êÆ°ping</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=help'),ENT_QUOTES);?>">¥Ø¥ë¥×</a></li>
+    <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['AdminURL'].'index.php?action=pluginoptions&plugid='.$plugid),ENT_QUOTES);?>">¥×¥é¥°¥¤¥ó¥ª¥×¥·¥ç¥óÀßÄê</a></li>
 </ul>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/ping.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/ping.html
index 7e84542..2fbd8d5 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/ping.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/ping.html
@@ -1,10 +1,12 @@
+<?php global $manager; ?>
 <h2>¼êÆ°ping¥Õ¥©¡¼¥à</h2>
 
 <form method="post" action="<?php echo $CONF['PluginURL'];?>trackback/index.php">
 
     <input type="hidden" name="action" value="sendping" />
     <input type="hidden" name="next" value="ping" />
-    
+    <?php $manager->addTicketHidden(); ?>
+       
     <table>
         <tr>
             <th colspan='2'>¼êÆ°ping</th>

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetable.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetable.html
index f1a3835..3cd3099 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetable.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetable.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <blockquote style="color: red;border:1px solid red;padding:1em;"><b>¥¢¥Ã¥×¥Ç¡¼¥È¤¬É¬ÍפǤ¹:</b><br />
 ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç±¿ÍѤ¹¤ë¤¿¤á¤Ë¤ÏDBÆâ¤Î¥Æ¡¼¥Ö¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤¬É¬ÍפǤ¹¡£<br />
 º£¤Þ¤Ç¤Î¥Ç¡¼¥¿¤¬ºï½ü¤µ¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
@@ -6,6 +7,7 @@
                        <form method="post"><div>
                                <input type="hidden" name="action" value="tableUpgrade" />
                                <input type="submit" tabindex="10" value="upgrade table" />
+                               <?php $manager->addTicketHidden(); ?>
                        </div></form>
 </blockquote>
        

diff --git a/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetablefinished.html b/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetablefinished.html
index f994f0e..5bbc8d7 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetablefinished.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.templates/updatetablefinished.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <blockquote style="color: red;border:1px solid red;padding:1em;">
 ¥Æ¡¼¥Ö¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ï´°Î»¤·¤Þ¤·¤¿¡£
 </blockquote>

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.help.html b/trunk/NP_TrackBack/trackback/japanese-utf8.help.html
index 95c03cd..e7b2628 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.help.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.help.html
@@ -127,7 +127,7 @@ div.tb div.info {
 <ul>
        <li>Version 2.0.3jp7 : (2006/*/*)</li>
        <li>　[Changed] SpamChekについて微調整</li>
-       <li>　[Fixed] セキュリティの向上(ticket処理の追加。CSRF対策)</li>
+       <li>　[Added] Ticket処理を追加(CSRF対策)</li>
        
        <li>Version 2.0.3jp6 : (2006/09/30)</li>
        <li>　[Fixed] セキュリティの向上</li>

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/all.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/all.html
index 006df11..2727ecd 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/all.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/all.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        All trackbacks
        <?php if ($count > $amount): ?>
@@ -16,6 +17,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -27,6 +29,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -59,13 +62,13 @@
                                <?php echo str_replace(' ', '&nbsp;', date("Y-m-d @ H:i",$item['timestamp']));?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=block&amp;tb=<?php echo $item['id'];?>&amp;next=all&amp;start=<?php echo $start;?>'>Block</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=block&tb='.$item['id'].'&next=all&start='.$start),ENT_QUOTES);?>">Block</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=all&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=all&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -82,6 +85,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -93,6 +97,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -100,5 +105,4 @@
        </tr>
 </table>
 <?php endif; ?>
-<?php endif; ?>
-
+<?php endif; ?>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/blocked.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/blocked.html
index 274bb55..e3ca0ba 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/blocked.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/blocked.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        ブロックされたトラックバック
        <?php if ($count > $amount): ?>
@@ -6,8 +7,8 @@
 </h2>
 
 <ul>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked_clear&amp;next=blocked'>ブロックされたトラックバックのクリア</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked_spamclear&amp;next=blocked'>spam判定されたトラックバックのクリア</a></li> 
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked_clear&next=blocked'),ENT_QUOTES); ?>">ブロックされたトラックバックのクリア</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked_spamclear&next=blocked'),ENT_QUOTES); ?>">spam判定されたトラックバックのクリア</a></li> 
 </ul>
 
 <?php if(count($items)): ?>
@@ -21,6 +22,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -32,6 +34,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -76,13 +79,13 @@
                                        '<span style="color: darkred;">No</span>';?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=unblock&amp;tb=<?php echo $item['id'];?>&amp;next=blocked&amp;start=<?php echo $start;?>'>Unblock</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=unblock&tb='.$item['id'].'&next=blocked&start='.$start),ENT_QUOTES);?>">Unblock</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=blocked&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=blocked&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -99,6 +102,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -110,6 +114,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/form.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/form.html
index b7f4ee5..add813a 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/form.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/form.html
@@ -25,7 +25,7 @@
                        <input type="hidden" name="action" value="plugin" />
                        <input type="hidden" name="name" value="TrackBack" />
                        <input type="hidden" name="type" value="ping" />
-
+                       
                        <table>
                                <tr>
                                        <td>あなたの記事のurl</td>

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/index.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/index.html
index 79a1acf..15a2ce4 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/index.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/index.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>Overview of all items</h2>
 
 <?php if(count($blogs)): ?>
@@ -22,7 +23,7 @@
                                <?php echo htmlspecialchars($item['total']);?>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=list&amp;id=<?php echo $item['inumber'];?>'>Trackbacks</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=list&id='.$item['inumber']),ENT_QUOTES);?>">Trackbacks</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -30,6 +31,4 @@
 <?php endif; ?>
 <?php endwhile; ?>
 </table>
-<?php endif; ?>
-
-
+<?php endif; ?>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/list.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/list.html
index 9d9fd42..14f05f8 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/list.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/list.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        All trackbacks for &quot;<?php echo $story['title'];?>&quot;
        <?php if ($count > $amount): ?>
@@ -17,6 +18,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -29,6 +31,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -57,13 +60,13 @@
                                <?php echo str_replace(' ', '&nbsp;', date("Y-m-d @ H:i",$item['timestamp']));?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=block&amp;tb=<?php echo $item['id'];?>&amp;next=list&amp;id=<?php echo $story['id'];?>&amp;start=<?php echo $start;?>'>Block</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=block&tb='.$item['id'].'&next=list&id='.$story['id'].'&start='.$start),ENT_QUOTES);?>">Block</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=list&amp;id=<?php echo $story['id'];?>&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=list&id='.$story['id'].'&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -81,6 +84,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -93,6 +97,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/menu.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/menu.html
index a424f5d..cfdb16a 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/menu.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/menu.html
@@ -1,11 +1,11 @@
-
+<?php global $manager; ?>
 <h2>Trackback</h2>
 
 <ul>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=index'>Overview of all items</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=all'>トラックバックの全データ</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked'>ブロックされたトラックバック</a></li> 
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=ping'>手動ping</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=help'>ヘルプ</a></li>
-    <li><a href='<?php echo $CONF['AdminURL'];?>index.php?action=pluginoptions&amp;plugid=<?php echo $plugid;?>'>プラグインオプション設定</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=index'),ENT_QUOTES);?>">Overview of all items</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=all'),ENT_QUOTES);?>">トラックバックの全データ</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked'),ENT_QUOTES);?>">ブロックされたトラックバック</a></li> 
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=ping'),ENT_QUOTES);?>">手動ping</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=help'),ENT_QUOTES);?>">ヘルプ</a></li>
+    <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['AdminURL'].'index.php?action=pluginoptions&plugid='.$plugid),ENT_QUOTES);?>">プラグインオプション設定</a></li>
 </ul>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/ping.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/ping.html
index e3c170d..84a882c 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/ping.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/ping.html
@@ -1,10 +1,12 @@
+<?php global $manager; ?>
 <h2>手動pingフォーム</h2>
 
 <form method="post" action="<?php echo $CONF['PluginURL'];?>trackback/index.php">
 
     <input type="hidden" name="action" value="sendping" />
     <input type="hidden" name="next" value="ping" />
-    
+    <?php $manager->addTicketHidden(); ?>
+       
     <table>
         <tr>
             <th colspan='2'>手動ping</th>

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetable.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetable.html
index fedb372..a426a8a 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetable.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetable.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <blockquote style="color: red;border:1px solid red;padding:1em;"><b>アップデートが必要です:</b><br />
 このバージョンで運用するためにはDB内のテーブルのアップデートが必要です。<br />
 今までのデータが削除されることはありません。
@@ -6,6 +7,7 @@
                        <form method="post"><div>
                                <input type="hidden" name="action" value="tableUpgrade" />
                                <input type="submit" tabindex="10" value="upgrade table" />
+                               <?php $manager->addTicketHidden(); ?>
                        </div></form>
 </blockquote>
        

diff --git a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetablefinished.html b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetablefinished.html
index a34623b..6b1ea94 100644 (file)
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetablefinished.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.templates/updatetablefinished.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <blockquote style="color: red;border:1px solid red;padding:1em;">
 テーブルのアップデートは完了しました。
 </blockquote>

diff --git a/trunk/NP_TrackBack/trackback/templates/all.html b/trunk/NP_TrackBack/trackback/templates/all.html
index 006df11..2727ecd 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/all.html
+++ b/trunk/NP_TrackBack/trackback/templates/all.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        All trackbacks
        <?php if ($count > $amount): ?>
@@ -16,6 +17,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -27,6 +29,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -59,13 +62,13 @@
                                <?php echo str_replace(' ', '&nbsp;', date("Y-m-d @ H:i",$item['timestamp']));?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=block&amp;tb=<?php echo $item['id'];?>&amp;next=all&amp;start=<?php echo $start;?>'>Block</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=block&tb='.$item['id'].'&next=all&start='.$start),ENT_QUOTES);?>">Block</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=all&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=all&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -82,6 +85,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -93,6 +97,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="all" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -100,5 +105,4 @@
        </tr>
 </table>
 <?php endif; ?>
-<?php endif; ?>
-
+<?php endif; ?>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/templates/blocked.html b/trunk/NP_TrackBack/trackback/templates/blocked.html
index 3ccf55a..c6c2cd8 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/blocked.html
+++ b/trunk/NP_TrackBack/trackback/templates/blocked.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        Blocked trackbacks
        <?php if ($count > $amount): ?>
@@ -6,8 +7,8 @@
 </h2>
 
 <ul>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked_clear&amp;next=blocked'>Clear blocked trackbacks</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked_spamclear&amp;next=blocked'>Clear spam trackbacks</a></li> 
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked_clear&next=blocked'),ENT_QUOTES); ?>">ブロックされたトラックバックのクリア</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked_spamclear&next=blocked'),ENT_QUOTES); ?>">spam判定されたトラックバックのクリア</a></li> 
 </ul>
 
 <?php if(count($items)): ?>
@@ -21,6 +22,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -32,6 +34,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -76,13 +79,13 @@
                                        '<span style="color: darkred;">No</span>';?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=unblock&amp;tb=<?php echo $item['id'];?>&amp;next=blocked&amp;start=<?php echo $start;?>'>Unblock</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=unblock&tb='.$item['id'].'&next=blocked&start='.$start),ENT_QUOTES);?>">Unblock</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=blocked&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=blocked&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -99,6 +102,7 @@
                                        <input type="submit" value="&lt;&lt; Previous" />       
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -110,6 +114,7 @@
                                        <input type="submit" value="Next &gt; &gt;" />
                                        <input type="hidden" name="action" value="blocked" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>

diff --git a/trunk/NP_TrackBack/trackback/templates/form.html b/trunk/NP_TrackBack/trackback/templates/form.html
index c67ef7b..ba61b48 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/form.html
+++ b/trunk/NP_TrackBack/trackback/templates/form.html
@@ -25,7 +25,7 @@
                        <input type="hidden" name="action" value="plugin" />
                        <input type="hidden" name="name" value="TrackBack" />
                        <input type="hidden" name="type" value="ping" />
-
+                       
                        <table>
                                <tr>
                                        <td>Article URL</td>

diff --git a/trunk/NP_TrackBack/trackback/templates/index.html b/trunk/NP_TrackBack/trackback/templates/index.html
index 79a1acf..15a2ce4 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/index.html
+++ b/trunk/NP_TrackBack/trackback/templates/index.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>Overview of all items</h2>
 
 <?php if(count($blogs)): ?>
@@ -22,7 +23,7 @@
                                <?php echo htmlspecialchars($item['total']);?>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=list&amp;id=<?php echo $item['inumber'];?>'>Trackbacks</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=list&id='.$item['inumber']),ENT_QUOTES);?>">Trackbacks</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -30,6 +31,4 @@
 <?php endif; ?>
 <?php endwhile; ?>
 </table>
-<?php endif; ?>
-
-
+<?php endif; ?>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/templates/list.html b/trunk/NP_TrackBack/trackback/templates/list.html
index 9d9fd42..14f05f8 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/list.html
+++ b/trunk/NP_TrackBack/trackback/templates/list.html
@@ -1,3 +1,4 @@
+<?php global $manager; ?>
 <h2>
        All trackbacks for &quot;<?php echo $story['title'];?>&quot;
        <?php if ($count > $amount): ?>
@@ -17,6 +18,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -29,6 +31,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -57,13 +60,13 @@
                                <?php echo str_replace(' ', '&nbsp;', date("Y-m-d @ H:i",$item['timestamp']));?>
                        </td>
                        <td>
-                               <a href='<?php echo $item['url'];?>'>Visit</a>
+                               <a href="<?php echo $item['url'];?>">Visit</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=block&amp;tb=<?php echo $item['id'];?>&amp;next=list&amp;id=<?php echo $story['id'];?>&amp;start=<?php echo $start;?>'>Block</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=block&tb='.$item['id'].'&next=list&id='.$story['id'].'&start='.$start),ENT_QUOTES);?>">Block</a>
                        </td>
                        <td>
-                               <a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=delete&amp;tb=<?php echo $item['id'];?>&amp;next=list&amp;id=<?php echo $story['id'];?>&amp;start=<?php echo $start;?>'>Delete</a>
+                               <a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=delete&tb='.$item['id'].'&next=list&id='.$story['id'].'&start='.$start),ENT_QUOTES);?>">Delete</a>
                        </td>
                </tr>
                <?php endwhile; ?>
@@ -81,6 +84,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo max(0,$start - $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>
@@ -93,6 +97,7 @@
                                        <input type="hidden" name="action" value="list" />
                                        <input type="hidden" name="id" value="<?php echo $story['id'];?>" />
                                        <input type="hidden" name="start" value="<?php echo ($start + $amount);?>" />
+                                       <?php $manager->addTicketHidden(); ?>
                                </div>
                        </form>
                        <?php endif; ?>

diff --git a/trunk/NP_TrackBack/trackback/templates/menu.html b/trunk/NP_TrackBack/trackback/templates/menu.html
index c13d665..117d4fe 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/menu.html
+++ b/trunk/NP_TrackBack/trackback/templates/menu.html
@@ -1,14 +1,11 @@
-
+<?php global $manager; ?>
 <h2>Trackback</h2>
 
 <ul>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=index'>Overview of all items</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=all'>All trackbacks</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=blocked'>Blocked trackbacks</a></li> 
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=ping'>Manually ping another weblog</a></li>
-       <li><a href='<?php echo $CONF['PluginURL'];?>trackback/index.php?action=help'>Help</a></li>
-    <li><a href='<?php echo $CONF['AdminURL'];?>index.php?action=pluginoptions&amp;plugid=<?php echo $plugid;?>'>Plugin Options</a></li>
-</ul>
-
-<p>&nbsp;</p>
-       
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=index'),ENT_QUOTES);?>">Overview of all items</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=all'),ENT_QUOTES);?>">All trackbacks</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=blocked'),ENT_QUOTES);?>">Blocked trackbacks</a></li> 
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=ping'),ENT_QUOTES);?>">Manually ping another weblog</a></li>
+       <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['PluginURL'].'trackback/index.php?action=help'),ENT_QUOTES);?>">Help</a></li>
+    <li><a href="<?php echo htmlspecialchars($manager->addTicketToUrl($CONF['AdminURL'].'index.php?action=pluginoptions&plugid='.$plugid);?>">Plugin Options</a></li>
+</ul>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/templates/ping.html b/trunk/NP_TrackBack/trackback/templates/ping.html
index e5a8b43..91216ce 100644 (file)
--- a/trunk/NP_TrackBack/trackback/templates/ping.html
+++ b/trunk/NP_TrackBack/trackback/templates/ping.html
@@ -1,49 +1,50 @@
-
+<?php global $manager; ?>
 <h2>Manually ping another weblog</h2>
 
 <form method="post" action="<?php echo $CONF['PluginURL'];?>trackback/index.php">
 
-       <input type="hidden" name="action" value="sendping" />
-       <input type="hidden" name="next" value="ping" />
+    <input type="hidden" name="action" value="sendping" />
+    <input type="hidden" name="next" value="ping" />
+    <?php $manager->addTicketHidden(); ?>
        
-       <table>
-               <tr>
-                       <th colspan='2'>Manually Ping</th>
-               </tr>
-               <tr>
-                       <td>Your URL</td>
-                       <td>
-                               <input type="text" name="url" size="60" value="<?php echo htmlspecialchars($item['url']);?>" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Your Title</td>
-                       <td>
-                               <input type="text" value="" name="title" size="60" value="<?php echo htmlspecialchars($item['title']);?>" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Your Excerpt</td>
-                       <td>
-                                       <textarea name="excerpt" cols="40" rows="5"><?php echo $item['excerpt'];?></textarea>
-                       </td>
-               </tr>
-               <tr>
-                       <td>Your Blog Name</td>
-                       <td>
-                               <input type="text" name="blog_name" size="60" value="<?php echo htmlspecialchars($item['blogname']);?>" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>External Ping URL</td>
-                       <td>
-                               <input type="text" value="" name="ping_url" size="60" />
-                       </td>
-               </tr>
-               <tr>
-                       <td>Send Ping</td>
-                       <td><input type="submit" value="Send Ping" /></td>
-               </tr>
-       </table>
+    <table>
+        <tr>
+            <th colspan='2'>Manually Ping</th>
+        </tr>
+        <tr>
+            <td>Your URL</td>
+            <td>
+                <input type="text" name="url" size="60" value="<?php echo htmlspecialchars($item['url']);?>" />
+            </td>
+        </tr>
+        <tr>
+            <td>Your Title</td>
+            <td>
+                <input type="text" name="title" size="60" value="<?php echo htmlspecialchars($item['title']);?>" />
+            </td>
+        </tr>
+        <tr>
+            <td>Your Excerpt</td>
+            <td>
+                    <textarea name="excerpt" cols="40" rows="5"><?php echo $item['excerpt'];?></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>Your Blog Name</td>
+            <td>
+                <input type="text" name="blog_name" size="60" value="<?php echo htmlspecialchars($item['blogname']);?>" />
+            </td>
+        </tr>
+        <tr>
+            <td>External Ping URL</td>
+            <td>
+                <input type="text" value="" name="ping_url" size="60" />
+            </td>
+        </tr>
+        <tr>
+            <td>Send Ping</td>
+            <td><input type="submit" value="Send Ping" /></td>
+        </tr>
+    </table>
 
 </form>
\ No newline at end of file

diff --git a/trunk/NP_TrackBack/trackback/templates/updatetable.html b/trunk/NP_TrackBack/trackback/templates/updatetable.html
new file mode 100644 (file)
index 0000000..113e9e6
--- /dev/null
+++ b/trunk/NP_TrackBack/trackback/templates/updatetable.html
@@ -0,0 +1,9 @@
+<?php global $manager; ?>
+<blockquote style="color: red;border:1px solid red;padding:1em;"><b>Table update:</b><br />
+                       <form method="post"><div>
+                               <input type="hidden" name="action" value="tableUpgrade" />
+                               <input type="submit" tabindex="10" value="upgrade table" />
+                               <?php $manager->addTicketHidden(); ?>
+                       </div></form>
+</blockquote>
+       

diff --git a/trunk/NP_TrackBack/trackback/templates/updatetablefinished.html b/trunk/NP_TrackBack/trackback/templates/updatetablefinished.html
new file mode 100644 (file)
index 0000000..d94969e
--- /dev/null
+++ b/trunk/NP_TrackBack/trackback/templates/updatetablefinished.html
@@ -0,0 +1,5 @@
+<?php global $manager; ?>
+<blockquote style="color: red;border:1px solid red;padding:1em;">
+Table update done !
+</blockquote>
+