Changeset 5274 in subversion

Timestamp:

Sep 23, 2011 6:11:27 AM (20 months ago)

Author:

alec

Message:

• Make the whole PHP output non-cacheable (#1487797)

Location:

trunk/roundcubemail

Files:

• index.php (modified) (2 diffs)
• program/include/rcube_shared.inc (modified) (14 diffs)
• program/steps/addressbook/export.inc (modified) (1 diff)
• program/steps/mail/get.inc (modified) (1 diff)
• program/steps/mail/show.inc (modified) (1 diff)

trunk/roundcubemail/index.php

@@ -33 +33 @@
 // init application, start session, init output class, etc.
 $RCMAIL = rcmail::get_instance();
+
+// Make the whole PHP output non-cacheable (#1487797)
+send_nocacheing_headers();
 
 // turn on output buffering
@@ -178 +181 @@
     );
   }
-  
+
   if ($session_error || $_REQUEST['_err'] == 'session')
     $OUTPUT->show_message('sessionerror', 'error', null, true, -1);

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -23 +23 @@
 /**
  * Roundcube shared functions
- * 
+ *
  * @package Core
  */
@@ -71 +71 @@
 
 /**
- * Check request for If-Modified-Since and send an according response.
- * This will terminate the current script if headers match the given values
- *
- * @param int Modified date as unix timestamp
- * @param string Etag value for caching
- */
-function send_modified_header($mdate, $etag=null, $skip_check=false)
-{
-  if (headers_sent())
-    return;
-    
-  $iscached = false;
-  $etag = $etag ? "\"$etag\"" : null;
-
-  if (!$skip_check)
-  {
-    if ($_SERVER['HTTP_IF_MODIFIED_SINCE'] && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $mdate)
-      $iscached = true;
-  
-    if ($etag)
-      $iscached = ($_SERVER['HTTP_IF_NONE_MATCH'] == $etag);
-  }
-  
-  if ($iscached)
-    header("HTTP/1.x 304 Not Modified");
-  else
-    header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mdate)." GMT");
-  
-  header("Cache-Control: private, must-revalidate, max-age=0");
-  header("Expires: ");
-  header("Pragma: ");
-  
-  if ($etag)
-    header("Etag: $etag");
-  
-  if ($iscached)
-    {
-    ob_end_clean();
-    exit;
-    }
-}
-
-
-/**
  * Similar function as in_array() but case-insensitive
  *
@@ -127 +83 @@
     if ($needle===mb_strtolower($value))
       return true;
-  
+
   return false;
 }
@@ -219 +175 @@
   $host_url = $base_url;
   $abs_path = $path;
-  
+
   // check if path is an absolute URL
   if (preg_match('/^[fhtps]+:\/\//', $path))
@@ -326 +282 @@
 
   return $hdrs[$key];
-  }
+}
 
 
@@ -345 +301 @@
   return preg_replace('/\/$/', '', $str);
 }
-  
+
 
 /**
@@ -375 +331 @@
  */
 function get_offset_time($offset_str, $factor=1)
-  {
+{
   if (preg_match('/^([0-9]+)\s*([smhdw])/i', $offset_str, $regs))
   {
@@ -386 +342 @@
     $unit = 's';
   }
-    
+
   $ts = mktime();
   switch ($unit)
@@ -419 +375 @@
 {
   $length = mb_strlen($str);
-  
+
   if ($length > $maxlength)
   {
@@ -433 +389 @@
   return $str;
 }
+
 
 /**
@@ -548 +505 @@
     return $input;
   }
-  
+
   if (!is_string($input) || $input == '')
     return $input;
@@ -570 +527 @@
     '|\xF4[\x80-\x8F][\x80-\xBF][\x80-\xBF]'.       // UTF8-4
     ')$/';
-  
+
   $seq = '';
   $out = '';
@@ -641 +598 @@
     }
   }
-  
+
   $result[] = substr($string, $p);
   return $result;
@@ -656 +613 @@
 {
   $keys = array();
-  
+
   if (!empty($array))
     foreach ($array as $key => $child) {

trunk/roundcubemail/program/steps/addressbook/export.inc

@@ -67 +67 @@
 
 // send downlaod headers
-send_nocacheing_headers();
 header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
 header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');

trunk/roundcubemail/program/steps/mail/get.inc

@@ -64 +64 @@
   $MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
 }
-
-send_nocacheing_headers();
 
 // show part page

trunk/roundcubemail/program/steps/mail/show.inc

@@ -31 +31 @@
   }
 
-  send_nocacheing_headers();
-
   $mbox_name = $IMAP->get_mailbox_name();