Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Cont...

diff --combined lib/filelib.php
index 8406807,32cafba..b5767e7
--- 1/lib/filelib.php
--- 2/lib/filelib.php
+++ b/lib/filelib.php
@@@ -2188,11 -2188,11 +2188,11 @@@ function send_temp_file($path, $filenam
  
      header('Content-Disposition: attachment; filename="'.$filename.'"');
      if (strpos($CFG->wwwroot, 'https://') === 0) { //https sites - watch out for IE! KB812935 and KB316431
-         header('Cache-Control: private, max-age=10');
+         header('Cache-Control: private, max-age=10, no-transform');
          header('Expires: '. gmdate('D, d M Y H:i:s', 0) .' GMT');
          header('Pragma: ');
      } else { //normal http - prevent caching at all cost
-         header('Cache-Control: private, must-revalidate, pre-check=0, post-check=0, max-age=0');
+         header('Cache-Control: private, must-revalidate, pre-check=0, post-check=0, max-age=0, no-transform');
          header('Expires: '. gmdate('D, d M Y H:i:s', 0) .' GMT');
          header('Pragma: no-cache');
      }
@@@ -2274,18 -2274,18 +2274,18 @@@ function send_file($path, $filename, $l
              $private = ' private,';
          }
          $nobyteserving = false;
-         header('Cache-Control:'.$private.' max-age='.$lifetime);
+         header('Cache-Control:'.$private.' max-age='.$lifetime.', no-transform');
          header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
          header('Pragma: ');
  
      } else { // Do not cache files in proxies and browsers
          $nobyteserving = true;
          if (strpos($CFG->wwwroot, 'https://') === 0) { //https sites - watch out for IE! KB812935 and KB316431
-             header('Cache-Control: private, max-age=10');
+             header('Cache-Control: private, max-age=10, no-transform');
              header('Expires: '. gmdate('D, d M Y H:i:s', 0) .' GMT');
              header('Pragma: ');
          } else { //normal http - prevent caching at all cost
-             header('Cache-Control: private, must-revalidate, pre-check=0, post-check=0, max-age=0');
+             header('Cache-Control: private, must-revalidate, pre-check=0, post-check=0, max-age=0, no-transform');
              header('Expires: '. gmdate('D, d M Y H:i:s', 0) .' GMT');
              header('Pragma: no-cache');
          }
@@@ -2445,17 -2445,17 +2445,17 @@@ function send_stored_file($stored_file
          if (isloggedin() and !isguestuser()) {
              $private = ' private,';
          }
-         header('Cache-Control:'.$private.' max-age='.$lifetime);
+         header('Cache-Control:'.$private.' max-age='.$lifetime.', no-transform');
          header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
          header('Pragma: ');
  
      } else { // Do not cache files in proxies and browsers
          if (strpos($CFG->wwwroot, 'https://') === 0) { //https sites - watch out for IE! KB812935 and KB316431
-             header('Cache-Control: private, max-age=10');
+             header('Cache-Control: private, max-age=10, no-transform');
              header('Expires: '. gmdate('D, d M Y H:i:s', 0) .' GMT');
              header('Pragma: ');
          } else { //normal http - prevent caching at all cost
-             header('Cache-Control: private, must-revalidate, pre-check=0, post-check=0, max-age=0');
+             header('Cache-Control: private, must-revalidate, pre-check=0, post-check=0, max-age=0, no-transform');
              header('Expires: '. gmdate('D, d M Y H:i:s', 0) .' GMT');
              header('Pragma: no-cache');
          }
@@@ -2672,7 -2672,7 +2672,7 @@@ function fulldelete($location) 
   */
  function byteserving_send_file($handle, $mimetype, $ranges, $filesize) {
      // better turn off any kind of compression and buffering
 -    @ini_set('zlib.output_compression', 'Off');
 +    ini_set('zlib.output_compression', 'Off');
  
      $chunksize = 1*(1024*1024); // 1MB chunks - must be less than 2MB!
      if ($handle === false) {
@@@ -2924,7 -2924,7 +2924,7 @@@ class curl 
          }
  
          if (!isset($this->emulateredirects)) {
 -            $this->emulateredirects = (ini_get('open_basedir') or ini_get('safe_mode'));
 +            $this->emulateredirects = ini_get('open_basedir');
          }
      }
  

diff --combined lib/weblib.php
index ef39522,c499f46..a5780b0
--- 1/lib/weblib.php
--- 2/lib/weblib.php
+++ b/lib/weblib.php
@@@ -1523,25 -1523,6 +1523,25 @@@ function format_module_intro($module, $
      return trim(format_text($intro, $activity->introformat, $options, null));
  }
  
 +/**
 + * Removes the usage of Moodle files from a text.
 + *
 + * In some rare cases we need to re-use a text that already has embedded links
 + * to some files hosted within Moodle. But the new area in which we will push
 + * this content does not support files... therefore we need to remove those files.
 + *
 + * @param string $source The text
 + * @return string The stripped text
 + */
 +function strip_pluginfile_content($source) {
 +    $baseurl = '@@PLUGINFILE@@';
 +    // Looking for something like < .* "@@pluginfile@@.*" .* >
 +    $pattern = '$<[^<>]+["\']' . $baseurl . '[^"\']*["\'][^<>]*>$';
 +    $stripped = preg_replace($pattern, '', $source);
 +    // Use purify html to rebalence potentially mismatched tags and generally cleanup.
 +    return purify_html($stripped);
 +}
 +
  /**
   * Legacy function, used for cleaning of old forum and glossary text only.
   *
@@@ -2053,13 -2034,13 +2053,13 @@@ function send_headers($contenttype, $ca
  
      if ($cacheable) {
          // Allow caching on "back" (but not on normal clicks).
-         @header('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
+         @header('Cache-Control: private, pre-check=0, post-check=0, max-age=0, no-transform');
          @header('Pragma: no-cache');
          @header('Expires: ');
      } else {
          // Do everything we can to always prevent clients and proxies caching.
          @header('Cache-Control: no-store, no-cache, must-revalidate');
-         @header('Cache-Control: post-check=0, pre-check=0', false);
+         @header('Cache-Control: post-check=0, pre-check=0, no-transform', false);
          @header('Pragma: no-cache');
          @header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
          @header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
@@@ -2569,7 -2550,6 +2569,7 @@@ function redirect($url, $message='', $d
      if ($PAGE) {
          $PAGE->set_context(null);
          $PAGE->set_pagelayout('redirect');  // No header and footer needed.
 +        $PAGE->set_title(get_string('pageshouldredirect', 'moodle'));
      }
  
      if ($url instanceof moodle_url) {

diff --combined theme/yui_image.php
index ee89461,b7c69bf..5a8818e
--- 1/theme/yui_image.php
--- 2/theme/yui_image.php
+++ b/theme/yui_image.php
@@@ -60,9 -60,9 +60,9 @@@ if ($version == 'moodle' && count($part
      if (!file_exists($imagepath) or !is_file($imagepath)) {
          $imagepath = $dir . '/yui/' . $module . '/assets/skins/sam/' . $image;
      }
 -} else if ($version == 'gallery' && count($parts)==3) {
 -    list($module, $version, $image) = $parts;
 -    $imagepath = "$CFG->dirroot/lib/yui/gallery/$module/$version/assets/skins/sam/$image";
 +} else if ($version == 'gallery' && count($parts) >= 3) {
 +    list($revision, $module, , , , $image) = $parts;
 +    $imagepath = "$CFG->dirroot/lib/yuilib/gallery/$module/assets/skins/sam/$image";
  } else if (count($parts) == 1 && ($version == $CFG->yui3version || $version == $CFG->yui2version)) {
      list($image) = $parts;
      if ($version == $CFG->yui3version) {
@@@ -98,7 -98,7 +98,7 @@@ if (strpos($path, '/-1/') === false an
      header('HTTP/1.1 304 Not Modified');
      header('Last-Modified: '. gmdate('D, d M Y H:i:s', filemtime($imagepath)) .' GMT');
      header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
-     header('Cache-Control: public, max-age='.$lifetime);
+     header('Cache-Control: public, max-age='.$lifetime.', no-transform');
      header('Content-Type: '.$mimetype);
      header('Etag: "'.$etag.'"');
      die;
@@@ -117,7 -117,7 +117,7 @@@ function yui_image_cached($imagepath, $
      header('Last-Modified: '. gmdate('D, d M Y H:i:s', filemtime($imagepath)) .' GMT');
      header('Expires: '. gmdate('D, d M Y H:i:s', time() + $lifetime) .' GMT');
      header('Pragma: ');
-     header('Cache-Control: public, max-age=315360000');
+     header('Cache-Control: public, max-age=315360000, no-transform');
      header('Accept-Ranges: none');
      header('Content-Type: '.$mimetype);
      header('Content-Length: '.filesize($imagepath));