* Request UID and UIDVALIDITY from the status response if not available in the

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index b07aec7af8e5071fae44fee3375e2ec8482fd7a4..e3d5a5055fea80ded01322b78ea92532f59bf6f9 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -156,17 +156,29 @@ $aMbxResponse['SORT_ARRAY'] = false;
 
 sqgetGlobalVar('aLastSelectedMailbox',$aLastSelectedMailbox,SQ_SESSION);
 
+// deal with imap servers that do not return the required UIDNEXT or
+// UIDVALIDITY response
+// from a SELECT call (since rfc 3501 it's required)
+if (!isset($aMbxResponse['UIDNEXT']) || !isset($aMbxResponse['UIDVALIDITY'])) {
+    $aStatus = sqimap_status_messages($imapConnection,$mailbox,
+                                      array('UIDNEXT','UIDVALIDITY'));
+    $aMbxResponse['UIDNEXT'] = $aStatus['UIDNEXT'];
+    $aMbxResponse['UIDVALIDTY'] = $aStatus['UIDVALIDITY'];
+}
+
 if ($aLastSelectedMailbox && !isset($newsort)) {
-  // check if we deal with the same mailbox
-  if ($aLastSelectedMailbox['NAME'] == $mailbox) {
-     if ($aLastSelectedMailbox['EXISTS'] == $aMbxResponse['EXISTS'] &&
-         $aLastSelectedMailbox['UIDVALIDITY'] == $aMbxResponse['UIDVALIDITY'] &&
-         $aLastSelectedMailbox['UIDNEXT'] == $aMbxResponse['UIDNEXT']) {
-         // sort is still valid
-         sqgetGlobalVar('server_sort_array',$server_sort_array,SQ_SESSION);
-         $aMbxResponse['SORT_ARRAY'] = $server_sort_array;
-     }
-  } 
+    // check if we deal with the same mailbox
+    if ($aLastSelectedMailbox['NAME'] == $mailbox) {
+       if ($aLastSelectedMailbox['EXISTS'] == $aMbxResponse['EXISTS'] &&
+           $aLastSelectedMailbox['UIDVALIDITY'] == $aMbxResponse['UIDVALIDITY'] &&
+           $aLastSelectedMailbox['UIDNEXT']  == $aMbxResponse['UIDNEXT']) {
+           // sort is still valid
+           sqgetGlobalVar('server_sort_array',$server_sort_array,SQ_SESSION);
+           if ($server_sort_array && is_array($server_sort_array)) {
+               $aMbxResponse['SORT_ARRAY'] = $server_sort_array;
+           }
+       }
+    } 
 }
  
 $aLastSelectedMailbox['NAME'] = $mailbox;