Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20142/skins/default Modified Files: administration-page.thtml advanced-page.thtml bucket-page.thtml common-bottom.thtml common-middle.thtml configuration-bar.thtml corpus-page.thtml history-bar.thtml history-page.thtml history-search-filter-widget.thtml imap-bucket-folders.thtml imap-connection-details.thtml imap-options.thtml imap-update-mailbox-list.thtml imap-watch-folders.thtml imap-watch-more-folders.thtml magnet-navigator.thtml magnet-page.thtml nntp-force-fork.thtml nntp-port.thtml nntp-security-local.thtml nntp-separator.thtml password-page.thtml pop3-chain-panel.thtml pop3-configuration-panel.thtml pop3-security-panel.thtml smtp-chain-server-port.thtml smtp-chain-server.thtml smtp-configuration.thtml smtp-security-local.thtml socks-widget.thtml users-page.thtml view-page.thtml view-quickmagnets-widget.thtml view-scores-widget.thtml windows-configuration.thtml xmlrpc-local.thtml xmlrpc-port.thtml Log Message: More work on v0.23.0 (Multi-user Support) Switch to using Cookies to keep client-side state concerning the current connection to POPFile's UI. Implement encrypted cookies and a login page that allow multiple users to be connected to POPFile's UI at the same time. Currently, it's possible to create users and login as people other than admin, but there's not a lot you can do with the users that are created. For the time being just login as admin (no password). My next commit will make multi-user mode actually work: there will be ability to logout, associations between POP3 accounts and POPFile users... DO NOT USE THIS FOR ANYTHING MORE THAN LOGGING IN AS ADMIN RIGHT NOW; STRANGE THINGS MAY HAPPEN! --- Classifer/Bayes.pm: Make API sessions keys much more robust and unlikely to clash by generating them randomly using a good random number source and using a long secure hash instead of my old system. UI/HTML.pm: New functions for cookie handling: handle_cookie__ (to deal with a received cookie), set_cookie__ (to send a cookie back to the client). password_page now asks for a username as well as a password and handle the creation of the API session and redirection with cookie. Remove the old api_session__ and replace with the sessions__ hash used to keep track of current sessions. Return the Set-Cookie: header. No hard-coded user '1' anywhere, all that is replaced with the user id derived by looking up the current session in the sessions__ hash. UI/HTTP.pm: New APIs decrypt_cookie__ and encrypt_cookie__ to handle encryption and decryption of cookies (with wrapping in base 64 for safety). Use Blowfish encryption with a randomly generated key each time POPFile is started. skins/default/*.thtml: Remove references to the old Session_Key (session= and hidden inputs) because it is no longer needed at all. skins/default/password-page.thtml: Password page now has a user name field and does not have an error message hard coded. skins/default/common-middle.thtml: The shutdown link is only available to admins, the tabs and shutdown are only available if you are logged in. skins/default/common-bottom.thtml: No information at all until you are logged in. languages/English.msg: Additional strings needed for the password page. Index: advanced-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/advanced-page.thtml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** advanced-page.thtml 13 Feb 2005 02:16:35 -0000 1.12 --- advanced-page.thtml 15 Feb 2005 04:23:54 -0000 1.13 *************** *** 28,32 **** <form action="/advanced" method="post"> <label class="advancedLabel" for="advancedAddWordText"><TMPL_VAR NAME="Localize_Advanced_AddWord">:</label><br /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="text" id="advancedAddWordText" name="newword" /> <input type="submit" class="submit" name="add" value="<TMPL_VAR NAME="Localize_Add">" /> --- 28,31 ---- *************** *** 43,47 **** <form action="/advanced" method="post"> <label class="advancedLabel" for="advancedRemoveWordText"><TMPL_VAR NAME="Localize_Advanced_RemoveWord">:</label><br /> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="text" id="advancedRemoveWordText" name="word" /> <input type="submit" class="submit" name="remove" value="<TMPL_VAR NAME="Localize_Remove">" /> --- 42,46 ---- <form action="/advanced" method="post"> <label class="advancedLabel" for="advancedRemoveWordText"><TMPL_VAR NAME="Localize_Advanced_RemoveWord">:</label><br /> ! <input type="text" id="advancedRemoveWordText" name="word" /> <input type="submit" class="submit" name="remove" value="<TMPL_VAR NAME="Localize_Remove">" /> *************** *** 105,109 **** </table> <p> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="submit" class="submit" value="<TMPL_VAR NAME="Localize_Update">" name="update_params"> </form> --- 104,108 ---- </table> <p> ! <input type="submit" class="submit" value="<TMPL_VAR NAME="Localize_Update">" name="update_params"> </form> Index: socks-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/socks-widget.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** socks-widget.thtml 6 Jan 2005 14:57:05 -0000 1.5 --- socks-widget.thtml 15 Feb 2005 04:23:55 -0000 1.6 *************** *** 6,10 **** <input type="text" name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" id="SOCKSServer" value="<TMPL_VAR NAME="Socks_Server">" /> <input type="submit" class="submit" name="update_<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 6,9 ---- *************** *** 24,28 **** <input name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_port" type="text" id="configSOCKSPort" value="<TMPL_VAR NAME="Socks_Port">" /> <input type="submit" class="submit" name="update_<TMPL_VAR NAME="Socks_Widget_Name">_socks_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 23,26 ---- Index: view-quickmagnets-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-quickmagnets-widget.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** view-quickmagnets-widget.thtml 24 Jun 2004 19:12:10 -0000 1.3 --- view-quickmagnets-widget.thtml 15 Feb 2005 04:23:55 -0000 1.4 *************** *** 3,7 **** <form action="/magnets" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="count" value="<TMPL_VAR NAME="View_QuickMagnets_Count">" /> <hr /> --- 3,6 ---- Index: xmlrpc-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-local.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xmlrpc-local.thtml 7 Feb 2005 08:05:51 -0000 1.4 --- xmlrpc-local.thtml 15 Feb 2005 04:23:55 -0000 1.5 *************** *** 4,9 **** </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="XMLRPC_local_on"> --- 4,7 ---- Index: nntp-separator.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-separator.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nntp-separator.thtml 6 Jan 2005 14:57:05 -0000 1.2 --- nntp-separator.thtml 15 Feb 2005 04:23:54 -0000 1.3 *************** *** 6,10 **** <input name="nntp_separator" id="configSeparator" type="text" value="<TMPL_VAR NAME="nntp_separator">" /> <input type="submit" class="submit" name="update_nntp_separator" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="nntp_separator_feedback"> --- 6,9 ---- Index: xmlrpc-port.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-port.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xmlrpc-port.thtml 6 Jan 2005 14:57:05 -0000 1.4 --- xmlrpc-port.thtml 15 Feb 2005 04:23:55 -0000 1.5 *************** *** 1,4 **** <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <label class="configurationLabel" for="configPopPort"> <TMPL_VAR NAME="Localize_Configuration_XMLRPCPort">: --- 1,3 ---- Index: magnet-navigator.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-navigator.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** magnet-navigator.thtml 8 Sep 2004 16:15:40 -0000 1.3 --- magnet-navigator.thtml 15 Feb 2005 04:23:54 -0000 1.4 *************** *** 5,9 **** <TMPL_IF NAME="Magnet_Navigator_If_Previous"> ! [<a href="/magnets?start_magnet=<TMPL_VAR NAME="Magnet_Navigator_Previous">&session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Previous"></a>] </TMPL_IF> --- 5,9 ---- <TMPL_IF NAME="Magnet_Navigator_If_Previous"> ! [<a href="/magnets?start_magnet=<TMPL_VAR NAME="Magnet_Navigator_Previous">"><TMPL_VAR NAME="Localize_Previous"></a>] </TMPL_IF> *************** *** 17,21 **** <TMPL_ELSE> ! [<a href="/magnets?start_magnet=<TMPL_VAR NAME="Magnet_Navigator_Start_Magnet">&session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Magnet_Navigator_Count"></a>] </TMPL_IF> --- 17,21 ---- <TMPL_ELSE> ! [<a href="/magnets?start_magnet=<TMPL_VAR NAME="Magnet_Navigator_Start_Magnet">"><TMPL_VAR NAME="Magnet_Navigator_Count"></a>] </TMPL_IF> *************** *** 24,28 **** <TMPL_IF NAME="Magnet_Navigator_If_Next"> ! [<a href="/magnets?start_magnet=<TMPL_VAR NAME="Magnet_Navigator_Next">&session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Next"></a>] </TMPL_IF> --- 24,28 ---- <TMPL_IF NAME="Magnet_Navigator_If_Next"> ! [<a href="/magnets?start_magnet=<TMPL_VAR NAME="Magnet_Navigator_Next">"><TMPL_VAR NAME="Localize_Next"></a>] </TMPL_IF> Index: view-scores-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-scores-widget.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** view-scores-widget.thtml 13 Sep 2004 20:27:09 -0000 1.8 --- view-scores-widget.thtml 15 Feb 2005 04:23:55 -0000 1.9 *************** *** 95,99 **** <TMPL_IF NAME="View_If_Format_Freq"> ! <a href="/view?session=<TMPL_VAR NAME="Session_Key">&view=<TMPL_VAR NAME="View_This">&start_message=<TMPL_VAR NAME="View_This_Page">&format=freq#scores"> <TMPL_VAR NAME="Localize_View_ShowFrequencies"></a> --- 95,99 ---- <TMPL_IF NAME="View_If_Format_Freq"> ! <a href="/view?view=<TMPL_VAR NAME="View_This">&start_message=<TMPL_VAR NAME="View_This_Page">&format=freq#scores"> <TMPL_VAR NAME="Localize_View_ShowFrequencies"></a> *************** *** 102,106 **** <TMPL_IF NAME="View_If_Format_Prob"> ! <a href="/view?session=<TMPL_VAR NAME="Session_Key">&view=<TMPL_VAR NAME="View_This">&start_message=<TMPL_VAR NAME="View_This_Page">&format=prob#scores"> <TMPL_VAR NAME="Localize_View_ShowProbabilities"></a> --- 102,106 ---- <TMPL_IF NAME="View_If_Format_Prob"> ! <a href="/view?view=<TMPL_VAR NAME="View_This">&start_message=<TMPL_VAR NAME="View_This_Page">&format=prob#scores"> <TMPL_VAR NAME="Localize_View_ShowProbabilities"></a> *************** *** 109,113 **** <TMPL_IF NAME="View_If_Format_Score"> ! <a href="/view?session=<TMPL_VAR NAME="Session_Key">&view=<TMPL_VAR NAME="View_This">&start_message=<TMPL_VAR NAME="View_This_Page">&format=score#scores"> <TMPL_VAR NAME="Localize_View_ShowScores"></a> --- 109,113 ---- <TMPL_IF NAME="View_If_Format_Score"> ! <a href="/view?view=<TMPL_VAR NAME="View_This">&start_message=<TMPL_VAR NAME="View_This_Page">&format=score#scores"> <TMPL_VAR NAME="Localize_View_ShowScores"></a> Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** magnet-page.thtml 7 Feb 2005 08:05:51 -0000 1.9 --- magnet-page.thtml 15 Feb 2005 04:23:54 -0000 1.10 *************** *** 81,85 **** </tr> </table> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="start_magnet" value="<TMPL_VAR NAME="Magnet_Start_Magnet">" /> <input type="hidden" name="count" value="<TMPL_VAR NAME="Magnet_Count_Magnet">" /> --- 81,84 ---- *************** *** 116,120 **** </select> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <br /> <br /> --- 115,118 ---- *************** *** 145,149 **** <input type="submit" class="submit" name="create" value="<TMPL_VAR NAME="Localize_Create">" /> <input type="hidden" name="start_magnet" value="<TMPL_VAR NAME="Magnet_Start_Magnet">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 143,146 ---- Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** history-page.thtml 9 Feb 2005 10:45:35 -0000 1.54 --- history-page.thtml 15 Feb 2005 04:23:54 -0000 1.55 *************** *** 7,11 **** <form method="post" action="/buckets"> <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <p /> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 7,10 ---- *************** *** 20,24 **** <form method="post" action="/buckets"> <TMPL_VAR NAME="Localize_Help_Training"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <p /> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 19,22 ---- *************** *** 43,47 **** </TMPL_IF> ! (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> --- 41,45 ---- </TMPL_IF> ! (<a class="history" href="/history"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> *************** *** 60,64 **** <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> <input type="hidden" name="negate" value="<TMPL_VAR NAME="History_Field_Not">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> <input type="hidden" name="filter" value="<TMPL_VAR NAME="History_Field_Filter">" /> --- 58,61 ---- *************** *** 76,80 **** <tr> <td width="10px" align="left" style="white-space:nowrap; vertical-align: top;"> ! <a style="display: block; width:100%; height: 1em;" class="columnRemove" href="/history?session=<TMPL_VAR NAME="Session_Key">&removecolumn=<TMPL_VAR NAME="History_Header">"><img title="<TMPL_VAR NAME="Localize_History_RemoveColumn">" src="skins/x.gif" border="0" alt=""></a> </td> <th style="text-align: left;"> --- 73,77 ---- <tr> <td width="10px" align="left" style="white-space:nowrap; vertical-align: top;"> ! <a style="display: block; width:100%; height: 1em;" class="columnRemove" href="/history?removecolumn=<TMPL_VAR NAME="History_Header">"><img title="<TMPL_VAR NAME="Localize_History_RemoveColumn">" src="skins/x.gif" border="0" alt=""></a> </td> <th style="text-align: left;"> *************** *** 109,118 **** <TMPL_IF NAME="History_If_MoveLeft"> <td width="10px" style="vertical-align: top;"> ! <a style="display: block; width:100%; height: 1em;" class="columnMove" href="/history?session=<TMPL_VAR NAME="Session_Key">&moveleft=<TMPL_VAR NAME="History_Header">"><img title="<TMPL_VAR NAME="Localize_History_MoveLeft">" src="skins/leftarrow.gif" border="0" alt=""></a> </td> </TMPL_IF> <TMPL_IF NAME="History_If_MoveRight"> <td width="10px" style="vertical-align: top;"> ! <a style="display: block; width:100%; height: 1em;" class="columnMove" href="/history?session=<TMPL_VAR NAME="Session_Key">&moveright=<TMPL_VAR NAME="History_Header">"><img title="<TMPL_VAR NAME="Localize_History_MoveRight">" src="skins/rightarrow.gif" border="0" alt=""></a> </td> </TMPL_IF> --- 106,115 ---- <TMPL_IF NAME="History_If_MoveLeft"> <td width="10px" style="vertical-align: top;"> ! <a style="display: block; width:100%; height: 1em;" class="columnMove" href="/history?moveleft=<TMPL_VAR NAME="History_Header">"><img title="<TMPL_VAR NAME="Localize_History_MoveLeft">" src="skins/leftarrow.gif" border="0" alt=""></a> </td> </TMPL_IF> <TMPL_IF NAME="History_If_MoveRight"> <td width="10px" style="vertical-align: top;"> ! <a style="display: block; width:100%; height: 1em;" class="columnMove" href="/history?moveright=<TMPL_VAR NAME="History_Header">"><img title="<TMPL_VAR NAME="Localize_History_MoveRight">" src="skins/rightarrow.gif" border="0" alt=""></a> </td> </TMPL_IF> *************** *** 158,162 **** <TMPL_IF NAME="History_If_Not_Pseudo"> ! <a href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="History_Bucket">"> </TMPL_IF> --- 155,159 ---- <TMPL_IF NAME="History_If_Not_Pseudo"> ! <a href="/buckets?showbucket=<TMPL_VAR NAME="History_Bucket">"> </TMPL_IF> *************** *** 280,284 **** </TMPL_IF> ! (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> --- 277,281 ---- </TMPL_IF> ! (<a class="history" href="/history"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> *************** *** 316,320 **** <div class="toggleConfigBar"> <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> </div> --- 313,316 ---- Index: imap-connection-details.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-connection-details.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** imap-connection-details.thtml 6 Jan 2005 14:57:05 -0000 1.4 --- imap-connection-details.thtml 15 Feb 2005 04:23:54 -0000 1.5 *************** *** 60,64 **** <p /> <input type="submit" class="submit" name="update_imap_0_connection_details" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <hr width="60%" align="center" /> </form> --- 60,63 ---- Index: nntp-force-fork.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-force-fork.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nntp-force-fork.thtml 6 Jan 2005 14:57:05 -0000 1.3 --- nntp-force-fork.thtml 15 Feb 2005 04:23:54 -0000 1.4 *************** *** 7,11 **** <td nowrap="nowrap"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="nntp_force_fork_on"> --- 7,10 ---- Index: history-search-filter-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-search-filter-widget.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** history-search-filter-widget.thtml 2 Sep 2004 23:13:41 -0000 1.8 --- history-search-filter-widget.thtml 15 Feb 2005 04:23:54 -0000 1.9 *************** *** 16,20 **** </label> <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <select name="filter" id="historyFilter"> <option value=""></option> --- 16,19 ---- Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** corpus-page.thtml 7 Feb 2005 08:05:51 -0000 1.17 --- corpus-page.thtml 15 Feb 2005 04:23:54 -0000 1.18 *************** *** 7,11 **** <form method="post" action="/buckets"> <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <p /> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 7,10 ---- *************** *** 20,24 **** <form method="post" action="/buckets"> <TMPL_VAR NAME="Localize_Help_Training"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <p /> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 19,22 ---- *************** *** 33,37 **** <form class="bucketsSwitch" action="/buckets" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <table width="100%" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> --- 31,34 ---- *************** *** 86,90 **** <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! <a href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> </TMPL_IF> --- 83,87 ---- <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! <a href="/buckets?showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> </TMPL_IF> *************** *** 242,246 **** <td colspan="2" align="center"> <form action="/buckets" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="submit" class="submit" name="reset_stats" value="<TMPL_VAR NAME="Localize_Bucket_ResetStatistics">" /> --- 239,242 ---- *************** *** 312,316 **** <input name="cname" id="bucketsCreateBucket" type="text" /> <input type="submit" class="submit" name="create" value="<TMPL_VAR NAME="Localize_Create">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 308,311 ---- *************** *** 353,357 **** </select> <input type="submit" class="submit" name="delete" value="<TMPL_VAR NAME="Localize_Delete">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 348,351 ---- *************** *** 388,392 **** <input type="text" id="bucketsRenameBucketTo" name="newname" /> <input type="submit" class="submit" name="rename" value="<TMPL_VAR NAME="Localize_Rename">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 382,385 ---- *************** *** 425,429 **** <input name="word" id="bucketsLookup" type="text" /> <input type="submit" class="submit" name="lookup" value="<TMPL_VAR NAME="Localize_Lookup">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> <br /> --- 418,421 ---- Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** administration-page.thtml 7 Feb 2005 08:05:50 -0000 1.4 --- administration-page.thtml 15 Feb 2005 04:23:54 -0000 1.5 *************** *** 12,17 **** </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="Security_If_Local"> --- 12,15 ---- *************** *** 49,53 **** <TMPL_VAR NAME="Localize_Security_Update">: </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="Security_If_Update_Check"> --- 47,50 ---- *************** *** 77,81 **** <TMPL_VAR NAME="Localize_Security_Stats">: </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="Security_If_Send_Stats"> --- 74,77 ---- *************** *** 109,113 **** <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" /> <input type="submit" class="submit" name="update_timeout" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 105,108 ---- *************** *** 130,134 **** <TMPL_VAR NAME="Localize_Configuration_LoggerOutput">: </label> ! <input type="hidden" value="<TMPL_VAR NAME="Session_Key">" name="session" /> <select name="debug" id="configLogging"> <option value="1" <TMPL_VAR NAME="Configuration_Debug_1_Selected">> --- 125,129 ---- <TMPL_VAR NAME="Localize_Configuration_LoggerOutput">: </label> ! <select name="debug" id="configLogging"> <option value="1" <TMPL_VAR NAME="Configuration_Debug_1_Selected">> *************** *** 151,155 **** <p> ! <a href="popfile_current_log.log?session=<TMPL_VAR NAME="Session_Key">" class="downloadLogLink"><TMPL_VAR NAME="Localize_Configuration_CurrentLogFile"></a> </p> --- 146,150 ---- <p> ! <a href="popfile_current_log.log" class="downloadLogLink"><TMPL_VAR NAME="Localize_Configuration_CurrentLogFile"></a> </p> *************** *** 166,170 **** <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" /> <input type="submit" class="submit" name="update_ui_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 161,165 ---- <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" /> <input type="submit" class="submit" name="update_ui_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> Index: view-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-page.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** view-page.thtml 10 Aug 2004 01:53:25 -0000 1.9 --- view-page.thtml 15 Feb 2005 04:23:55 -0000 1.10 *************** *** 24,28 **** <input type="hidden" name="search" value="<TMPL_VAR NAME="View_Field_Search">" /> <input type="hidden" name="sort" value="<TMPL_VAR NAME="View_Field_Sort">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="negate" value="<TMPL_VAR NAME="View_Field_Negate">" /> <input type="hidden" name="start_message" value="<TMPL_VAR NAME="View_This_Page">" /> --- 24,27 ---- Index: imap-update-mailbox-list.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-update-mailbox-list.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** imap-update-mailbox-list.thtml 6 Jan 2005 14:57:05 -0000 1.3 --- imap-update-mailbox-list.thtml 15 Feb 2005 04:23:54 -0000 1.4 *************** *** 19,23 **** <input type="submit" class="submit" name="do_imap_4_update_mailbox_list" value="<TMPL_VAR NAME="Localize_Imap_Now">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 19,22 ---- Index: smtp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-security-local.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** smtp-security-local.thtml 6 Jan 2005 14:57:05 -0000 1.4 --- smtp-security-local.thtml 15 Feb 2005 04:23:55 -0000 1.5 *************** *** 4,9 **** </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="smtp_local_on"> --- 4,7 ---- Index: pop3-security-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pop3-security-panel.thtml 7 Feb 2005 08:05:51 -0000 1.8 --- pop3-security-panel.thtml 15 Feb 2005 04:23:54 -0000 1.9 *************** *** 4,9 **** </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="POP3_Security_Local"> --- 4,7 ---- Index: pop3-configuration-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-configuration-panel.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pop3-configuration-panel.thtml 7 Feb 2005 08:05:51 -0000 1.7 --- pop3-configuration-panel.thtml 15 Feb 2005 04:23:54 -0000 1.8 *************** *** 6,10 **** <input name="pop3_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="POP3_Configuration_Port">" /> <input type="submit" class="submit" name="update_pop3_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 6,9 ---- *************** *** 34,38 **** <input name="pop3_separator" id="configSeparator" type="text" value="<TMPL_VAR NAME="POP3_Configuration_Separator">" /> <input type="submit" class="submit" name="update_pop3_separator" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 33,36 ---- *************** *** 71,75 **** <input type="submit" class="submit toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="pop3_force_fork" value="1" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 69,72 ---- *************** *** 82,86 **** <input type="submit" class="submit toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="pop3_force_fork" value="0" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 79,82 ---- Index: history-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-bar.thtml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** history-bar.thtml 13 Feb 2005 02:16:35 -0000 1.12 --- history-bar.thtml 15 Feb 2005 04:23:54 -0000 1.13 *************** *** 31,35 **** </TMPL_LOOP> <input type="submit" class="submit" name="update_fields" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> </div> --- 31,34 ---- *************** *** 41,45 **** <input name="page_size" id="configPageSize" type="text" size="4" maxlength="4" value="<TMPL_VAR NAME="Configuration_Page_Size">" /> <input type="submit" class="submit" name="update_page_size" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </div> --- 40,43 ---- Index: imap-bucket-folders.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-bucket-folders.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** imap-bucket-folders.thtml 6 Jan 2005 14:57:05 -0000 1.6 --- imap-bucket-folders.thtml 15 Feb 2005 04:23:54 -0000 1.7 *************** *** 38,42 **** <input type="submit" class="submit" name="imap_3_bucket_folders" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 38,41 ---- Index: users-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/users-page.thtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** users-page.thtml 13 Feb 2005 02:23:07 -0000 1.1 --- users-page.thtml 15 Feb 2005 04:23:55 -0000 1.2 *************** *** 8,12 **** <form action="/users" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_VAR NAME="Localize_Users_CreateUser">: <input type="text" id="usersCreateUser" name="newuser" /> --- 8,11 ---- *************** *** 28,32 **** <form action="/users" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_VAR NAME="Localize_Users_RemoveUser">: <select name="toremove"> --- 27,30 ---- *************** *** 45,49 **** <form action="/users" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_VAR NAME="Localize_Users_EditUser">: <select name="editname"> --- 43,46 ---- *************** *** 100,104 **** </table> <br /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="editname" value="<TMPL_VAR NAME="Users_Edit_User_Name">" /> <input type="hidden" name="edituser" value="<TMPL_VAR NAME="Users_Edit_User_Name">" /> --- 97,100 ---- Index: nntp-port.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-port.thtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nntp-port.thtml 24 Jun 2004 11:50:57 -0000 1.1 --- nntp-port.thtml 15 Feb 2005 04:23:54 -0000 1.2 *************** *** 6,10 **** <input name="nntp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="nntp_port">" /> <input type="submit" class="submit" name="update_nntp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="nntp_port_feedback"> --- 6,9 ---- Index: imap-options.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-options.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** imap-options.thtml 6 Jan 2005 14:57:05 -0000 1.7 --- imap-options.thtml 15 Feb 2005 04:23:54 -0000 1.8 *************** *** 28,32 **** <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <hr width="60%" align="center" /> </form> --- 28,31 ---- Index: pop3-chain-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-chain-panel.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pop3-chain-panel.thtml 6 Jan 2005 14:57:05 -0000 1.5 --- pop3-chain-panel.thtml 15 Feb 2005 04:23:54 -0000 1.6 *************** *** 6,10 **** <input type="text" name="server" id="securitySecureServer" value="<TMPL_VAR NAME="POP3_Chain_Secure_Server">" /> <input type="submit" class="submit" name="update_server" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 6,9 ---- *************** *** 24,28 **** <input type="text" name="sport" id="securitySecurePort" value="<TMPL_VAR NAME="POP3_Chain_Secure_Port">" /> <input type="submit" class="submit" name="update_sport" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 23,26 ---- Index: common-bottom.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-bottom.thtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** common-bottom.thtml 14 Jan 2005 09:30:24 -0000 1.11 --- common-bottom.thtml 15 Feb 2005 04:23:54 -0000 1.12 *************** *** 1,2 **** --- 1,4 ---- + <TMPL_IF NAME="Header_If_Password"> + <TMPL_ELSE> <table class="footer" summary=""> <tr> *************** *** 30,33 **** --- 32,36 ---- </tr> </table> + </TMPL_IF> </body> </html> Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configuration-bar.thtml 9 Feb 2005 10:45:35 -0000 1.9 --- configuration-bar.thtml 15 Feb 2005 04:23:54 -0000 1.10 *************** *** 7,11 **** </label> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> <select name="skin" id="configSkin"> --- 7,10 ---- Index: nntp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-security-local.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nntp-security-local.thtml 6 Jan 2005 14:57:05 -0000 1.3 --- nntp-security-local.thtml 15 Feb 2005 04:23:54 -0000 1.4 *************** *** 4,9 **** </div> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="nntp_if_local"> --- 4,7 ---- Index: smtp-chain-server.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-chain-server.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** smtp-chain-server.thtml 6 Jan 2005 14:57:05 -0000 1.2 --- smtp-chain-server.thtml 15 Feb 2005 04:23:54 -0000 1.3 *************** *** 6,10 **** <input type="text" name="smtp_chain_server" id="securitySecureServer" value="<TMPL_VAR NAME="smtp_chain_server">" /> <input type="submit" class="submit" name="update_smtp_server" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="smtp_server_feedback"> --- 6,9 ---- Index: imap-watch-more-folders.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-more-folders.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** imap-watch-more-folders.thtml 6 Jan 2005 14:57:05 -0000 1.3 --- imap-watch-more-folders.thtml 15 Feb 2005 04:23:54 -0000 1.4 *************** *** 9,13 **** </label> <br /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 9,12 ---- Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** common-middle.thtml 13 Feb 2005 02:16:35 -0000 1.8 --- common-middle.thtml 15 Feb 2005 04:23:54 -0000 1.9 *************** *** 12,16 **** <tr> <td class="head"><TMPL_VAR NAME="Localize_Header_Title"></td> ! <td class="headShutdown" align="right" valign="bottom"><a class="shutdownLink" href="/shutdown"><TMPL_VAR NAME="Localize_Header_Shutdown"></a> </td> </tr> </table> --- 12,16 ---- <tr> <td class="head"><TMPL_VAR NAME="Localize_Header_Title"></td> ! <td class="headShutdown" align="right" valign="bottom"><TMPL_IF NAME="Header_If_Password"><TMPL_ELSE><TMPL_IF NAME="Common_Middle_If_CanAdmin"><a class="shutdownLink" href="/shutdown"><TMPL_VAR NAME="Localize_Header_Shutdown"></a></TMPL_IF></TMPL_IF> </td> </tr> </table> *************** *** 33,62 **** <br /> </TMPL_IF> <table class="menu" cellspacing="0" summary="<TMPL_VAR NAME="Localize_Header_MenuSummary>"> <tr> <td class="menuIndent"> </td> <td class="<TMPL_VAR NAME="Common_Middle_Tab0">" align="center"> ! <a class="menuLink" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_History"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab1">" align="center"> ! <a class="menuLink" href="/buckets?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Buckets"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab2">" align="center"> ! <a class="menuLink" href="/magnets?session=<TMPL_VAR NAME="Session_Key">&start_magnet=0"><TMPL_VAR NAME="Localize_Header_Magnets"></a> </td> <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> ! <a class="menuLink" href="/administration?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> ! <a class="menuLink" href="/users?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab6">" align="center"> ! <a class="menuLink" href="/advanced?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </td> </TMPL_IF> --- 33,64 ---- <br /> </TMPL_IF> + <TMPL_IF NAME="Header_If_Password"> + <TMPL_ELSE> <table class="menu" cellspacing="0" summary="<TMPL_VAR NAME="Localize_Header_MenuSummary>"> <tr> <td class="menuIndent"> </td> <td class="<TMPL_VAR NAME="Common_Middle_Tab0">" align="center"> ! <a class="menuLink" href="/history"><TMPL_VAR NAME="Localize_Header_History"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab1">" align="center"> ! <a class="menuLink" href="/buckets"><TMPL_VAR NAME="Localize_Header_Buckets"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab2">" align="center"> ! <a class="menuLink" href="/magnets?start_magnet=0"><TMPL_VAR NAME="Localize_Header_Magnets"></a> </td> <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> ! <a class="menuLink" href="/administration"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> ! <a class="menuLink" href="/users"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab6">" align="center"> ! <a class="menuLink" href="/advanced"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </td> </TMPL_IF> *************** *** 64,67 **** --- 66,70 ---- </tr> </table> + </TMPL_IF> <table class="shell" align="center" width="100%" summary=""> <tr class="shellTopRow"> Index: smtp-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-configuration.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** smtp-configuration.thtml 6 Jan 2005 14:57:05 -0000 1.4 --- smtp-configuration.thtml 15 Feb 2005 04:23:54 -0000 1.5 *************** *** 7,12 **** <td nowrap="nowrap"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="smtp_force_fork_on"> --- 7,10 ---- *************** *** 41,45 **** <input name="smtp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="smtp_port">" /> <input type="submit" class="submit" name="update_smtp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="smtp_port_feedback"> --- 39,42 ---- Index: smtp-chain-server-port.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-chain-server-port.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** smtp-chain-server-port.thtml 6 Jan 2005 14:57:05 -0000 1.2 --- smtp-chain-server-port.thtml 15 Feb 2005 04:23:54 -0000 1.3 *************** *** 6,10 **** <input type="text" name="smtp_chain_server_port" id="securitySecurePort" value="<TMPL_VAR NAME="smtp_chain_port">" /> <input type="submit" class="submit" name="update_smtp_server_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="smtp_port_feedback"> --- 6,9 ---- Index: password-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/password-page.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** password-page.thtml 12 Jul 2004 22:33:17 -0000 1.2 --- password-page.thtml 15 Feb 2005 04:23:54 -0000 1.3 *************** *** 4,24 **** <h2 class="password"><TMPL_VAR NAME="Localize_Password_Title"></h2> <form action="/password" method="post"> <label class="passwordLabel" for="thePassword"> ! <TMPL_VAR NAME="Localize_Password_Enter">: </label> ! <input type="hidden" name="redirect" value="<TMPL_VAR NAME="Password_Redirect">" /> <input type="password" id="thePassword" name="password" /> <input type="submit" class="submit" name="submit" value="<TMPL_VAR NAME="Localize_Password_Go">" /> </form> ! <TMPL_IF NAME="Password_If_Error"> ! ! <blockquote> ! <div class="error02"> ! <TMPL_VAR NAME="Localize_Password_Error1"> ! </div> ! </blockquote> ! ! </TMPL_IF> ! <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 4,24 ---- <h2 class="password"><TMPL_VAR NAME="Localize_Password_Title"></h2> <form action="/password" method="post"> + <table><tr><td> + <label class="passwordLabel" for="theUsername"> + <TMPL_VAR NAME="Localize_Password_Username">: + </label> + </td><td> + <input type="text" id="theUsername" name="username" /><br /> + </td></tr><tr><td> <label class="passwordLabel" for="thePassword"> ! <TMPL_VAR NAME="Localize_Password_Password">: </label> ! </td><td> <input type="password" id="thePassword" name="password" /> + </td></tr></table> + <br /> <input type="submit" class="submit" name="submit" value="<TMPL_VAR NAME="Localize_Password_Go">" /> </form> ! <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> Index: windows-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/windows-configuration.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** windows-configuration.thtml 7 Feb 2005 08:05:51 -0000 1.3 --- windows-configuration.thtml 15 Feb 2005 04:23:55 -0000 1.4 *************** *** 7,12 **** <td nowrap="nowrap"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <TMPL_IF NAME="windows_console_on"> --- 7,10 ---- *************** *** 46,50 **** <td nowrap="nowrap"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <TMPL_IF NAME="windows_icon_on"> --- 44,47 ---- Index: imap-watch-folders.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-folders.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** imap-watch-folders.thtml 6 Jan 2005 14:57:05 -0000 1.4 --- imap-watch-folders.thtml 15 Feb 2005 04:23:54 -0000 1.5 *************** *** 30,34 **** <input type="submit" class="submit" name="update_imap_1_watch_folders" value="<TMPL_VAR NAME="Localize_Apply">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> </form> --- 30,33 ---- Index: bucket-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bucket-page.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bucket-page.thtml 14 Jan 2005 20:43:19 -0000 1.9 --- bucket-page.thtml 15 Feb 2005 04:23:54 -0000 1.10 *************** *** 52,56 **** <form action="/buckets" method="post"> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="hidden" name="showbucket" value="<TMPL_VAR NAME="Bucket_Bucket">" /> <input type="submit" name="clearbucket" class="submit" value="<TMPL_VAR NAME="Localize_SingleBucket_ClearBucket">" /> --- 52,55 ---- *************** *** 78,82 **** <TMPL_ELSE> ! <a class="bucketLetter" href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="Bucket_Bucket">&showletter=<TMPL_VAR NAME="Bucket_Letter" ESCAPE=URL>"> <b> <TMPL_VAR NAME="Bucket_Letter" ESCAPE=HTML> --- 77,81 ---- <TMPL_ELSE> ! <a class="bucketLetter" href="/buckets?showbucket=<TMPL_VAR NAME="Bucket_Bucket">&showletter=<TMPL_VAR NAME="Bucket_Letter" ESCAPE=URL>"> <b> <TMPL_VAR NAME="Bucket_Letter" ESCAPE=HTML> *************** *** 116,120 **** <td> ! <a class="wordListLink" href="/buckets?session=<TMPL_VAR NAME="Session_Key">&lookup=Lookup&word=<TMPL_VAR NAME="Bucket_Word">#Lookup"> <b> <TMPL_VAR NAME="Bucket_Word"> --- 115,119 ---- <td> ! <a class="wordListLink" href="/buckets?lookup=Lookup&word=<TMPL_VAR NAME="Bucket_Word">#Lookup"> <b> <TMPL_VAR NAME="Bucket_Word"> |