X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fspamcop%2Foptions.php;h=f30987ad46b9a27141c63410a89ddeeb65a203dd;hp=bc5e76ff5da1f9129ef7fab3224bb426e944a3b3;hb=cdb3b004685f28cd34a38cec8d446aba1f0f72ff;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index bc5e76ff..f30987ad 100755
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -1,40 +1,31 @@
 <?php
 
 /**
- *  options.php -- SpamCop options page
+ * options.php -- SpamCop options page
  *
- * @copyright (c) 1999-2004 The SquirrelMail development team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage spamcop
  */
 
-/** @ignore */
-define('SM_PATH','../../');
-require_once(SM_PATH . 'include/validate.php');
 
 /**
- * Internal spamcop plugin function.
- *
- * It is used to display similar action links.
- * @access private
+ * Include the SquirrelMail initialization file.
  */
-function spamcop_enable_disable($option,$disable_action,$enable_action) {
-    if ($option) {
-        $ret= _("Enabled") . "(<a href=\"options.php?action=$disable_action\">" . _("Disable it") . "</a>)\n";
-    } else {
-        $ret = _("Disabled") . "(<a href=\"options.php?action=$enable_action\">" . _("Enable it") . "</a>)\n";
-    }
-    return $ret;
-}
+require('../../include/init.php');
+/* plugin functions */
+include_once(SM_PATH . 'plugins/spamcop/functions.php');
 
 displayPageHeader($color, 'None');
 
+/** is spamcop plugin disabled */
+// option changes do nothing, if read_body_header_right hook is not active.
+
 /* globals */
 sqgetGlobalVar('action', $action);
 sqgetGlobalVar('meth', $meth);
-sqgetGlobalVar('type', $type);
 sqgetGlobalVar('ID' , $ID);
 
 sqgetGlobalVar('username', $username, SQ_SESSION);
@@ -55,16 +46,17 @@ switch ($action) {
     case 'delete':
         setPref($data_dir, $username, 'spamcop_delete', 1);
         break;
+    case 'keep':
+        setPref($data_dir, $username, 'spamcop_save', 0);
+        break;
+    case 'dontkeep':
+        setPref($data_dir, $username, 'spamcop_save', 1);
+        break;
     case 'meth':
         if (isset($meth)) {
             setPref($data_dir, $username, 'spamcop_method', $meth);
         }
         break;
-    case 'type':
-        if (isset($type)) {
-            setPref($data_dir, $username, 'spamcop_type', $type);
-        }
-        break;
     case 'save_id':
         if (isset($ID)) {
             $ID = trim($ID);
@@ -75,16 +67,16 @@ switch ($action) {
         break;
 }
 
-global $spamcop_enabled, $spamcop_delete, $spamcop_quick_report;
-spamcop_load();
+global $spamcop_enabled, $spamcop_delete, $spamcop_save, $spamcop_quick_report;
+spamcop_load_function();
 
 ?>
       <br />
       <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
       <tr><td bgcolor="<?php echo $color[0]; ?>">
-        <center><b>
+        <div style="text-align: center;"><b>
         <?php echo _("Options") . " - " . _("Spam reporting"); ?>
-        </b></center>
+        </b></div>
       </td></tr></table>
       <br />
 
@@ -103,6 +95,14 @@ spamcop_load();
             echo html_tag('td', spamcop_enable_disable($spamcop_delete,'save','delete'),'','','valign="top"');
           ?>
         </tr>
+        <tr>
+          <?php
+            echo html_tag('td',_("Save emails submitted to SpamCop:") . "<br />\n" .
+            '<small>(' . _("Only works with email-based reporting") . ')</small>',
+            'right','','valign="top"');
+            echo html_tag('td', spamcop_enable_disable($spamcop_save,'keep','dontkeep'),'','','valign="top"');
+          ?>
+        </tr>
         <tr>
           <?php
             echo html_tag('td',_("Spam Reporting Method:"),'right');
@@ -137,32 +137,6 @@ spamcop_load();
             ?>
           </form></td>
         </tr>
-        <tr>
-            <?php
-              echo html_tag('td',_("Spam Service Type:"),'right');
-            ?>
-          <td>
-          <form method="post" action="options.php">
-            <select name="type">
-              <option value="free"
-                <?php
-                  if ($spamcop_type == 'free') echo ' selected="selected"';
-                  echo ">"._("Free reporting");
-                ?>
-              </option>
-              <option value="member"
-                <?php
-                  if ($spamcop_type == 'member') echo ' selected="selected"';
-                  echo ">"._("Member services");
-                ?>
-              </option>
-            </select>
-            <?php
-              echo '<input type="hidden" name="action" value="type" />' .
-                   '<input type="submit" value="' . _("Save Service Type") . "\" />\n";
-            ?>
-           </form></td>
-        </tr>
         <tr>
           <?php
             echo html_tag('td',_("Your SpamCop authorization code:") . "<br />" .