From cdbd37126dfb38a48d7b542a7f88cccaaf459024 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 10 Jul 2011 11:03:02 +0200 Subject: [PATCH] MDL-28279 remove flash client version blocking Everybody is responsible for upgrades of Flash, there is no excuse any more. --- admin/settings/security.php | 1 - lang/en/admin.php | 2 -- lang/en/moodle.php | 4 ---- lib/flashdetect/flashdetect.js | 30 -------------------------- lib/flashdetect/flashupgrade.fla | Bin 47104 -> 0 bytes lib/flashdetect/flashupgrade.swf | Bin 3621 -> 0 bytes lib/flashdetect/message.php | 30 -------------------------- lib/moodlelib.php | 1 - lib/outputrenderers.php | 6 ------ lib/outputrequirementslib.php | 5 ----- login/environment.php | 35 ------------------------------- pluginfile.php | 15 ------------- 12 files changed, 129 deletions(-) delete mode 100644 lib/flashdetect/flashdetect.js delete mode 100644 lib/flashdetect/flashupgrade.fla delete mode 100644 lib/flashdetect/flashupgrade.swf delete mode 100644 lib/flashdetect/message.php delete mode 100644 login/environment.php diff --git a/admin/settings/security.php b/admin/settings/security.php index ca95a478187ae..d9541b9f5b69a 100644 --- a/admin/settings/security.php +++ b/admin/settings/security.php @@ -81,7 +81,6 @@ $temp->add(new admin_setting_configcheckbox('loginhttps', get_string('loginhttps', 'admin'), get_string('configloginhttps', 'admin'), 0)); $temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0)); $temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0)); - $temp->add(new admin_setting_configtext('excludeoldflashclients', get_string('excludeoldflashclients', 'admin'), get_string('configexcludeoldflashclients', 'admin'), '10.0.12', PARAM_TEXT)); $ADMIN->add('security', $temp); diff --git a/lang/en/admin.php b/lang/en/admin.php index e967be0f49620..a6e165ffa242d 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -207,7 +207,6 @@ $string['configenablewebservices'] = 'Web services enable other systems to log in to this Moodle and perform operations. For extra security this feature should be disabled unless you are really using it.'; $string['configenablewsdocumentation'] = 'Enable auto-generation of web services documentation. A user can access to his own documentation on his security keys page {$a}. It displays the documentation for the enabled protocols only.'; $string['configerrorlevel'] = 'Choose the amount of PHP warnings that you want to be displayed. Normal is usually the best choice.'; -$string['configexcludeoldflashclients'] = 'Some versions of the Adobe Flash plugin are known to be vulnerable to attacks from malicious Flash content. You can specify a minimum supported version here, and Moodle will not show Flash files to users with lower versions. Instead they will see an alternate Flash file telling them how to upgrade. Leave this empty to disable all checks.'; $string['configextendedusernamechars'] = 'Enable this setting to allow students to use any characters in their usernames (note this does not affect their actual names). The default is "false" which restricts usernames to be alphanumeric lowercase characters, underscore (_), hyphen (-), period (.) or at symbol (@).'; $string['configextramemorylimit'] = 'Some scripts like search, backup/restore or cron require more memory. Set higher values for large sites.'; $string['configextrauserselectorfields'] = 'Select which fields are searched and displayed, in addition to full names, when selecting users, for example when assigning roles or when adding users to a group. For security reasons, it is recommended that the username field is NOT selected.'; @@ -514,7 +513,6 @@ $string['errorwithsettings'] = 'Some settings were not changed due to an error.'; $string['everyonewhocan'] = 'Everyone who can \'{$a}\''; $string['exceptions'] = 'exceptions'; -$string['excludeoldflashclients'] = 'Required Flash player version'; $string['experimental'] = 'Experimental'; $string['experimentalsettings'] = 'Experimental settings'; $string['extendedusernamechars'] = 'Allow extended characters in usernames'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index f97e4bd8b0489..50f5ebccd285f 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -663,10 +663,6 @@ $string['firstaccess'] = 'First access'; $string['firstname'] = 'First name'; $string['firsttime'] = 'Is this your first time here?'; -$string['flashlinkmessage'] = 'Please upgrade your Flash player now:'; -$string['flashupgrademessage'] = 'The Flash plugin is required to play this content, but the version you have is too old. - - You may need to log out and log in back after upgrade.'; $string['folder'] = 'Folder'; $string['folderclosed'] = 'Closed folder'; $string['folderopened'] = 'Opened folder'; diff --git a/lib/flashdetect/flashdetect.js b/lib/flashdetect/flashdetect.js deleted file mode 100644 index ed9f7c36c9183..0000000000000 --- a/lib/flashdetect/flashdetect.js +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// // -// This file is part of Moodle - http://moodle.org/ // -// Moodle - Modular Object-Oriented Dynamic Learning Environment // -// // -// Moodle is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 3 of the License, or // -// (at your option) any later version. // -// // -// Moodle is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Moodle. If not, see . // -// // -/////////////////////////////////////////////////////////////////////////// - -/* - * Library for flash player version detection - */ - -M.core_flashdetect = {}; - -M.core_flashdetect.init = function(Y) { - var flashversion = swfobject.getFlashPlayerVersion(); - Y.io(M.cfg.wwwroot+'/login/environment.php?sesskey='+M.cfg.sesskey+'&flashversion='+flashversion.major+'.'+flashversion.minor+'.'+flashversion.release, {method: "POST"}); -}; \ No newline at end of file diff --git a/lib/flashdetect/flashupgrade.fla b/lib/flashdetect/flashupgrade.fla deleted file mode 100644 index 9ca926447c146df84ffd81694402869ef23dc368..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47104 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. // -// // -/////////////////////////////////////////////////////////////////////////// - -/* - * This file displays some variable for the flashupgrade.swf - * the variable contain the translated message to displayed into the flashupgrade.swf ("Please update you flash ...") - * NOTE: flash can load variable from html (variable1=value&variable2=value2) - */ -require('../../config.php'); -require_login(); -echo 'alertmessage='.get_string('flashupgrademessage').'&linkmessage='.get_string('flashlinkmessage'); -?> diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 4eca02dc64681..f65e511d15335 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -7035,7 +7035,6 @@ function get_core_subsystems() { 'filepicker' => NULL, 'files' => 'files', 'filters' => NULL, - 'flashdetect' => NULL, 'fonts' => NULL, 'form' => 'lib/form', 'grades' => 'grade', diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 1f00572bdc6d7..be7eba7208362 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -313,12 +313,6 @@ public function standard_head_html() { $jsurl = $this->page->theme->javascript_url(false); $this->page->requires->js($jsurl); - // Perform a browser environment check for the flash version. Should only run once per login session. - if (!NO_MOODLE_COOKIES && isloggedin() && !empty($CFG->excludeoldflashclients) && empty($SESSION->flashversion)) { - $this->page->requires->js('/lib/swfobject/swfobject.js'); - $this->page->requires->js_init_call('M.core_flashdetect.init'); - } - // Get any HTML from the page_requirements_manager. $output .= $this->page->requires->get_head_code($this->page, $this); diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index 336f36e6a8106..bdd635fa7a18c 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -448,11 +448,6 @@ protected function find_module($component) { 'requires' => array('base', 'node', 'event', 'node-event-simulate'), 'fullpath' => '/message/module.js'); break; - case 'core_flashdetect': - $module = array('name' => 'core_flashdetect', - 'fullpath' => '/lib/flashdetect/flashdetect.js', - 'requires' => array('io')); - break; case 'core_group': $module = array('name' => 'core_group', 'fullpath' => '/group/module.js', diff --git a/login/environment.php b/login/environment.php deleted file mode 100644 index 07a0e99cac535..0000000000000 --- a/login/environment.php +++ /dev/null @@ -1,35 +0,0 @@ -. - -/** - * This script can set environment variables in the current session - * - * @package core - * @subpackage auth - * @copyright 2009 onwards Martin Dougiamas http://dougiamas.com - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -require('../config.php'); - -require_sesskey(); - -if (!empty($SESSION)) { - if ($flashversion = optional_param('flashversion', false, PARAM_TEXT)) { // eg 10.0.32 - $SESSION->flashversion = $flashversion; - } -} diff --git a/pluginfile.php b/pluginfile.php index cc855cc32bfef..e9e83db506bf9 100644 --- a/pluginfile.php +++ b/pluginfile.php @@ -56,21 +56,6 @@ $fs = get_file_storage(); -// If the file is a Flash file and that the user flash player is outdated return a flash upgrader MDL-20841 -$mimetype = mimeinfo('type', $args[count($args)-1]); -if (!empty($CFG->excludeoldflashclients) && $mimetype == 'application/x-shockwave-flash'&& !empty($SESSION->flashversion)) { - $userplayerversion = explode('.', $SESSION->flashversion); - $requiredplayerversion = explode('.', $CFG->excludeoldflashclients); - if (($userplayerversion[0] < $requiredplayerversion[0]) || - ($userplayerversion[0] == $requiredplayerversion[0] && $userplayerversion[1] < $requiredplayerversion[1]) || - ($userplayerversion[0] == $requiredplayerversion[0] && $userplayerversion[1] == $requiredplayerversion[1] - && $userplayerversion[2] < $requiredplayerversion[2])) { - $path = $CFG->dirroot."/lib/flashdetect/flashupgrade.swf"; // Alternate content asking user to upgrade Flash - $filename = "flashupgrade.swf"; - send_file($path, $filename, O, 0, false, false, 'application/x-shockwave-flash'); // Do not cache - } -} - // ======================================================================================================================== if ($component === 'blog') { // Blog file serving