Allow version numbers to omit trailing zeros

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index cf4e93320e2a62c851fe2c0fe6dce4f46633b3c2..9fb3725cf0ffbbed200071e9f0c018736a8a7b6f 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1334,6 +1334,11 @@ function handleMessageListForm($imapConnection, &$aMailbox, $sButton='',
     /* retrieve the check boxes */
     $aUid = (isset($msg) && is_array($msg)) ? array_values($msg) : $aUid;
     if (count($aUid) && $sButton != 'expunge') {
+
+        // make sure message UIDs are sanitized (BIGINT)
+        foreach ($aUid as $i => $uid)
+           $aUid[$i] = (preg_match('/^[0-9]+$/', $uid) ? $uid : '0');
+
         $aUpdatedMsgs = false;
         $bExpunge = false;
         switch ($sButton) {
@@ -1381,7 +1386,7 @@ function handleMessageListForm($imapConnection, &$aMailbox, $sButton='',
             break;
           default:
              // Hook for plugin buttons
-             $temp = array(&$sButton, &$aUid);
+             $temp = array(&$sButton, &$aMailbox, $iAccount, $aMailbox['NAME'], &$aUid);
              do_hook('mailbox_display_button_action', $temp);
              break;
         }
@@ -1497,7 +1502,7 @@ function handleMessageListForm($imapConnection, &$aMailbox, $sButton='',
             // know this was not an erroneous user action
             //
             global $null;
-            $temp = array(&$sButton, $null);
+            $temp = array(&$sButton, &$aMailbox, $iAccount, $aMailbox['NAME'], $null);
             if (!boolean_hook_function('mailbox_display_button_action', $temp, 1)
              && $sButton) {
                 $sError = _("No messages were selected.");