E_ALL is a moving target

[squirrelmail.git] / plugins / spamcop / options.php

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index fea104145b5cbe6236532389321db7d82dfb0e6c..4c9b5a7e35ea0e05c269c3663b03206dca069e39 100755 (executable)
--- 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-2005 The SquirrelMail Project Team
+ * @copyright 1999-2012 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');
+displayPageHeader($color);
+
+/** 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);
@@ -66,11 +57,6 @@ switch ($action) {
             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);
@@ -82,15 +68,15 @@ switch ($action) {
 }
 
 global $spamcop_enabled, $spamcop_delete, $spamcop_save, $spamcop_quick_report;
-spamcop_load();
+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 />
 
@@ -111,7 +97,7 @@ spamcop_load();
         </tr>
         <tr>
           <?php
-            echo html_tag('td',_("Save emails submitted to spamcop:") . "<br />\n" .
+            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"');
@@ -131,19 +117,19 @@ spamcop_load();
                     echo ">"._("Quick email-based reporting");
                     echo '</option>';
                 }
-              ?>
-              <option value="thorough_email"
-                <?php
-                  if ($spamcop_method == 'thorough_email') echo ' selected="selected"';
-                  echo ">"._("Thorough email-based reporting");
-                ?>
-              </option>
-              <option value="web_form"
-                <?php
-                  if ($spamcop_method == 'web_form') echo ' selected="selected"';
-                  echo ">"._("Web-based form");
-                ?>
-              </option>
+                   $selected = '';
+                   if ($spamcop_method == 'thorough_email') {
+                       $selected = ' selected';
+                   }
+                   echo sprintf('            <option value="thorough_email"%s>%s</option>',$selected, _("Through email-based reporting"));
+                   
+                   $selected = '';
+                   if ($spamcop_method == 'web_form') {
+                       $selected = ' selected';
+                   }
+                   echo sprintf('            <option value="web_form"%s>%s</option>', $selected, _("Web-based form"));
+                
+            ?>
             </select>
             <input type="hidden" name="action" value="meth" />
             <?php
@@ -151,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 />" .
@@ -234,4 +194,4 @@ echo '<p><b>' . _("More information") . '</b><br />';
 printf(_("For more information about SpamCop, it's services, spam in general, and many related topics, try reading through SpamCop's %sHelp and Feedback%s section."), '<a href="http://spamcop.net/help.shtml">', '</a>');
 echo "</p>\n";
 ?>
-</body></html>
\ No newline at end of file
+</body></html>