Re: [SM-DEVEL] Release planned this weekend

[Paul L. <pa...@sq...>]

On 11/30/06, Paul Lesniewski <pa...@sq...> wrote:
> > Due to some security issues that have been fixed, we're planning to
> > release SquirrelMail 1.4.9 this Saturday. There's a number of useful
> > fixes already present in CVS and CVS has been quite calm recently so we
> > think it's ready. Please do not commit anything that is not strictly a
> > bug fix in the upcoming two days.
>
> Actually, I've been sitting on two patches that are not bug fixes that
> Jon has seen.  Does anyone mind if these go in now?  They are fairly
> small:

FYI, first one adds an attachment */* hook and the second one allows
plugins to manipulate the login URI as presented in the signout page.


>
>
> --- functions/mime.php  20 Jun 2006 06:14:53 -0000      1.265.2.68
> +++ functions/mime.php  27 Oct 2006 03:38:28 -0000
> @@ -480,7 +480,8 @@
>
>         /* This executes the attachment hook with a specific MIME-type.
>          * If that doesn't have results, it tries if there's a rule
> -         * for a more generic type.
> +         * for a more generic type. Finally, a hook for ALL attachment
> +         * types is run as well.
>          */
>         $hookresults = do_hook("attachment $type0/$type1", $links,
>                 $startMessage, $id, $urlMailbox, $ent, $defaultlink,
> @@ -490,6 +491,9 @@
>                     $startMessage, $id, $urlMailbox, $ent, $defaultlink,
>                     $display_filename, $where, $what);
>         }
> +        $hookresults = do_hook("attachment */*", $hookresults[1],
> +                $startMessage, $id, $urlMailbox, $ent, $hookresults[6],
> +                $display_filename, $where, $what);
>
>         $links = $hookresults[1];
>         $defaultlink = $hookresults[6];
>
>
>
>
> --- functions/display_messages.php      14 May 2006 17:45:29 -0000
>  1.57.2.22
> +++ functions/display_messages.php      27 Oct 2006 03:35:49 -0000
> @@ -71,7 +71,10 @@
>         $color[8]  = '#000000';  /* black         Normal text            */
>     }
>
> -    list($junk, $errString, $errTitle) = do_hook('logout_error',
> $errString, $errTitle);
> +    $logout_link = $base_uri . 'src/login.php';
> +
> +    list($junk, $errString, $errTitle, $logout_link)
> +        = do_hook('logout_error', $errString, $errTitle, $logout_link);
>
>     if ( $errTitle == '' ) {
>         $errTitle = $errString;
> @@ -99,7 +102,7 @@
>          '<tr><td align="center">' . $errString . '</td></tr>'.
>          '<tr><td bgcolor="'.$color[0].'" align="center">'.
>          '<font color="'.$color[2].'"><b>'.
> -         '<a href="'.$base_uri.'src/login.php" target="'.$frame_top.'">'.
> +         '<a href="'.$logout_link.'" target="'.$frame_top.'">'.
>          _("Go to the login page") . '</a></b></font></td></tr>'.
>          '</table></td></tr></table></center></body></html>';
>  }
>