Fixed a couple things. Now I'm officially handing it over. :-)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2094 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/spamcop/setup.php b/plugins/spamcop/setup.php
index b8e7058deadf4d8762214a8147424a8dd384b360..f4d064c65e7fae8a8733108af0b2d016446084bb 100755 (executable)
--- a/plugins/spamcop/setup.php
+++ b/plugins/spamcop/setup.php
@@ -6,7 +6,7 @@ function squirrelmail_plugin_init_spamcop() {
    global $squirrelmail_plugin_hooks, $data_dir, $username,
       $spamcop_is_composing;
 
    global $squirrelmail_plugin_hooks, $data_dir, $username,
       $spamcop_is_composing;
 

-   $squirrelmail_plugin_hooks['options_register']['spamcop'] =
+   $squirrelmail_plugin_hooks['optpage_register_block']['spamcop'] =

       'spamcop_options';
    $squirrelmail_plugin_hooks['loading_prefs']['spamcop'] =
       'spamcop_load';
       'spamcop_options';
    $squirrelmail_plugin_hooks['loading_prefs']['spamcop'] =
       'spamcop_load';


@@ -65,14 +65,14 @@ echo urlencode($mailbox); ?>" target="_blank">');
 document.write("<?PHP echo _("Report as Spam"); ?>");
 document.write("</a>");
 </script><noscript>
 document.write("<?PHP echo _("Report as Spam"); ?>");
 document.write("</a>");
 </script><noscript>

-<a href="../plugins/spamcop/spamcop_web.php?passed_id=<?PHP
+<a href="../plugins/spamcop/spamcop.php?passed_id=<?PHP

 echo urlencode($passed_id); ?>&mailbox=<?PHP
 echo urlencode($mailbox); ?>&startMessage=<?PHP
 echo urlencode($startMessage); ?>"><?PHP
 echo _("Report as Spam"); ?></a>
 </noscript><?PHP
    } else {
 echo urlencode($passed_id); ?>&mailbox=<?PHP
 echo urlencode($mailbox); ?>&startMessage=<?PHP
 echo urlencode($startMessage); ?>"><?PHP
 echo _("Report as Spam"); ?></a>
 </noscript><?PHP
    } else {

-?><a href="../plugins/spamcop/spamcop_web.php?passed_id=<?PHP
+?><a href="../plugins/spamcop/spamcop.php?passed_id=<?PHP

 echo urlencode($passed_id); ?>&mailbox=<?PHP
 echo urlencode($mailbox); ?>&startMessage=<?PHP
 echo urlencode($startMessage); ?>"><?PHP
 echo urlencode($passed_id); ?>&mailbox=<?PHP
 echo urlencode($mailbox); ?>&startMessage=<?PHP
 echo urlencode($startMessage); ?>"><?PHP


@@ -84,9 +84,9 @@ echo _("Report as Spam"); ?></a><?PHP
 // Show the link to our own custom options page
 function spamcop_options()
 {
 // Show the link to our own custom options page
 function spamcop_options()
 {

-   global $optionpages;
+   global $optpage_blocks;

    
    

-   $optionpages[] = array(
+   $optpage_blocks[] = array(

       'name' => _("SpamCop - Spam Reporting"),
       'url' => '../plugins/spamcop/options.php',
       'desc' => _("Help fight the battle against unsolicited email.  SpamCop reads the spam email and determines the correct addresses to send complaints to.  Quite fast, really smart, and easy to use."),
       'name' => _("SpamCop - Spam Reporting"),
       'url' => '../plugins/spamcop/options.php',
       'desc' => _("Help fight the battle against unsolicited email.  SpamCop reads the spam email and determines the correct addresses to send complaints to.  Quite fast, really smart, and easy to use."),