'; - public $do_generation = false; - public $starttime; - public $original_db; - - public function __construct($settings = array(), $generate=false) { - global $CFG; - - $this->starttime = time()+microtime(); - - $arguments = array( - array('short'=>'u', 'long'=>'username', - 'help' => 'Your moodle username', 'type'=>'STRING', 'default' => ''), - array('short'=>'pw', 'long'=>'password', - 'help' => 'Your moodle password', 'type'=>'STRING', 'default' => ''), - array('short'=>'P', 'long' => 'database_prefix', - 'help' => 'Database prefix to use: tables must already exist or the script will abort!', - 'type'=>'STRING', 'default' => $CFG->prefix), - array('short'=>'c', 'long' => 'pre_cleanup', 'help' => 'Delete previously generated data'), - array('short'=>'C', 'long' => 'post_cleanup', - 'help' => 'Deletes all generated data at the end of the script (for benchmarking of generation only)'), - array('short'=>'t', 'long' => 'time_limit', - 'help' => 'Optional time limit after which to abort the generation, 0 = no limit. Default=0', - 'type'=>'SECONDS', 'default' => 0), - array('short'=>'v', 'long' => 'verbose', 'help' => 'Display extra information about the data generation'), - array('short'=>'q', 'long' => 'quiet', 'help' => 'Inhibits all outputs'), - array('short'=>'i', 'long' => 'ignore_errors', 'help' => 'Continue script execution when errors occur'), - array('short'=>'N', 'long' => 'no_data', 'help' => 'Generate nothing (used for cleaning up only)'), - array('short'=>'T', 'long' => 'tiny', - 'help' => 'Generates a tiny data set (1 of each course, module, user and section)', - 'default' => 0), - array('short'=>'nc', 'long' => 'number_of_courses', - 'help' => 'The number of courses to generate. Default=1', - 'type'=>'NUMBER', 'default' => 1), - array('short'=>'ns', 'long' => 'number_of_students', - 'help' => 'The number of students to generate. Default=250', - 'type'=>'NUMBER', 'default' => 250), - array('short'=>'sc', 'long' => 'students_per_course', - 'help' => 'The number of students to enrol in each course. Default=20', - 'type'=>'NUMBER', 'default' => 20), - array('short'=>'nsec', 'long' => 'number_of_sections', - 'help' => 'The number of sections to generate in each course. Default=10', - 'type'=>'NUMBER', 'default' => 10), - array('short'=>'nmod', 'long' => 'number_of_modules', - 'help' => 'The number of modules to generate in each section. Default=10', - 'type'=>'NUMBER', 'default' => 10), - array('short'=>'mods', 'long' => 'modules_list', - 'help' => 'The list of modules you want to generate', 'default' => $this->modules_list, - 'type' => 'mod1,mod2...'), - array('short'=>'rt', 'long' => 'resource_type', - 'help' => 'The specific type of resource you want to generate. Defaults to all', - 'default' => $this->resource_types, - 'type' => 'SELECT'), - array('short'=>'at', 'long' => 'assignment_type', - 'help' => 'The specific type of assignment you want to generate. Defaults to all', - 'default' => $this->assignment_types, - 'type' => 'SELECT'), - array('short'=>'ft', 'long' => 'forum_type', - 'help' => 'The specific type of forum you want to generate. Defaults to all', - 'default' => $this->forum_types, - 'type' => 'SELECT'), - array('short'=>'gf', 'long' => 'glossary_format', - 'help' => 'The specific format of glossary you want to generate. Defaults to all', - 'default' => $this->glossary_formats, - 'type' => 'SELECT'), - array('short'=>'ag', 'long' => 'assignment_grades', - 'help' => 'Generate random grades for each student/assignment tuple', 'default' => true), - array('short'=>'qg', 'long' => 'quiz_grades', - 'help' => 'Generate random grades for each student/quiz tuple', 'default' => true), - array('short'=>'eg', 'long' => 'entries_per_glossary', - 'help' => 'The number of definitions to generate per glossary. Default=0', - 'type'=>'NUMBER', 'default' => 1), - array('short'=>'nq', 'long' => 'questions_per_course', - 'help' => 'The number of questions to generate per course. Default=20', - 'type'=>'NUMBER', 'default' => 20), - array('short'=>'qq', 'long' => 'questions_per_quiz', - 'help' => 'The number of questions to assign to each quiz. Default=5', - 'type'=>'NUMBER', 'default' => 5), - array('short'=>'df', 'long' => 'discussions_per_forum', - 'help' => 'The number of discussions to generate for each forum. Default=5', - 'type'=>'NUMBER', 'default' => 5), - array('short'=>'pd', 'long' => 'posts_per_discussion', - 'help' => 'The number of posts to generate for each forum discussion. Default=15', - 'type'=>'NUMBER', 'default' => 15), - array('short'=>'fd', 'long' => 'fields_per_database', - 'help' => 'The number of fields to generate for each database. Default=4', - 'type'=>'NUMBER', 'default' => 4), - array('short'=>'drs', 'long' => 'database_records_per_student', - 'help' => 'The number of records to generate for each student/database tuple. Default=1', - 'type'=>'NUMBER', 'default' => 1), - array('short'=>'mc', 'long' => 'messages_per_chat', - 'help' => 'The number of messages to generate for each chat module. Default=10', - 'type'=>'NUMBER', 'default' => 10), - ); - - foreach ($arguments as $args_array) { - $this->settings[$args_array['long']] = new generator_argument($args_array); - } - - foreach ($settings as $setting => $value) { - $this->settings[$setting]->value = $value; - } - - if ($generate) { - $this->generate_data(); - } - } - - public function connect() { - global $DB, $CFG; - $this->original_db = $DB; - - $class = get_class($DB); - $DB = new $class(); - $DB->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $this->get('database_prefix')); - } - - public function dispose() { - global $DB; - $DB->dispose(); - $DB = $this->original_db; - } - - public function generate_users() { - global $DB, $CFG; - - /** - * USER GENERATION - */ - $this->verbose("Generating ".$this->get('number_of_students')." students..."); - $lastnames = array('SMITH','JOHNSON','WILLIAMS','JONES','BROWN','DAVIS','MILLER','WILSON', - 'MOORE','TAYLOR','ANDERSON','THOMAS','JACKSON','WHITE','HARRIS','MARTIN','THOMPSON', - 'GARCIA','MARTINEZ','ROBINSON','CLARK','RODRIGUEZ','LEWIS','LEE','WALKER','HALL', - 'ALLEN','YOUNG','HERNANDEZ','KING','WRIGHT','LOPEZ','HILL','SCOTT','GREEN','ADAMS', - 'BAKER','GONZALEZ','NELSON','CARTER','MITCHELL','PEREZ','ROBERTS','TURNER','PHILLIPS', - 'CAMPBELL','PARKER','EVANS','EDWARDS','COLLINS','STEWART','SANCHEZ','MORRIS','ROGERS', - 'REED','COOK','MORGAN','BELL','MURPHY','BAILEY','RIVERA','COOPER','RICHARDSON','COX', - 'HOWARD','WARD','TORRES','PETERSON','GRAY','RAMIREZ','JAMES','WATSON','BROOKS','KELLY', - 'SANDERS','PRICE','BENNETT','WOOD','BARNES','ROSS','HENDERSON','COLEMAN','JENKINS','PERRY', - 'POWELL','LONG','PATTERSON','HUGHES','FLORES','WASHINGTON','BUTLER','SIMMONS','FOSTER', - 'GONZALES','BRYANT','ALEXANDER','RUSSELL','GRIFFIN','DIAZ','HAYES','MYERS','FORD','HAMILTON', - 'GRAHAM','SULLIVAN','WALLACE','WOODS','COLE','WEST','JORDAN','OWENS','REYNOLDS','FISHER', - 'ELLIS','HARRISON','GIBSON','MCDONALD','CRUZ','MARSHALL','ORTIZ','GOMEZ','MURRAY','FREEMAN', - 'WELLS','WEBB','SIMPSON','STEVENS','TUCKER','PORTER','HUNTER','HICKS','CRAWFORD','HENRY', - 'BOYD','MASON','MORALES','KENNEDY','WARREN','DIXON','RAMOS','REYES','BURNS','GORDON','SHAW', - 'HOLMES','RICE','ROBERTSON','HUNT','BLACK','DANIELS','PALMER','MILLS','NICHOLS','GRANT', - 'KNIGHT','FERGUSON','ROSE','STONE','HAWKINS','DUNN','PERKINS','HUDSON','SPENCER','GARDNER', - 'STEPHENS','PAYNE','PIERCE','BERRY','MATTHEWS','ARNOLD','WAGNER','WILLIS','RAY','WATKINS', - 'OLSON','CARROLL','DUNCAN','SNYDER','HART','CUNNINGHAM','BRADLEY','LANE','ANDREWS','RUIZ', - 'HARPER','FOX','RILEY','ARMSTRONG','CARPENTER','WEAVER','GREENE','LAWRENCE','ELLIOTT','CHAVEZ', - 'SIMS','AUSTIN','PETERS','KELLEY','FRANKLIN','LAWSON','FIELDS','GUTIERREZ','RYAN','SCHMIDT', - 'CARR','VASQUEZ','CASTILLO','WHEELER','CHAPMAN','OLIVER','MONTGOMERY','RICHARDS','WILLIAMSON', - 'JOHNSTON','BANKS','MEYER','BISHOP','MCCOY','HOWELL','ALVAREZ','MORRISON','HANSEN','FERNANDEZ', - 'GARZA','HARVEY','LITTLE','BURTON','STANLEY','NGUYEN','GEORGE','JACOBS','REID','KIM','FULLER', - 'LYNCH','DEAN','GILBERT','GARRETT','ROMERO','WELCH','LARSON','FRAZIER','BURKE','HANSON','DAY', - 'MENDOZA','MORENO','BOWMAN','MEDINA','FOWLER'); - $firstnames = array( 'JAMES','JOHN','ROBERT','MARY','MICHAEL','WILLIAM','DAVID','RICHARD', - 'CHARLES','JOSEPH','THOMAS','PATRICIA','LINDA','CHRISTOPHER','BARBARA','DANIEL','PAUL', - 'MARK','ELIZABETH','JENNIFER','DONALD','GEORGE','MARIA','KENNETH','SUSAN','STEVEN','EDWARD', - 'MARGARET','BRIAN','DOROTHY','RONALD','ANTHONY','LISA','KEVIN','NANCY','KAREN','BETTY', - 'HELEN','JASON','MATTHEW','GARY','TIMOTHY','SANDRA','JOSE','LARRY','JEFFREY','DONNA', - 'FRANK','CAROL','RUTH','SCOTT','ERIC','STEPHEN','ANDREW','SHARON','MICHELLE','LAURA', - 'SARAH','KIMBERLY','DEBORAH','JESSICA','RAYMOND','SHIRLEY','CYNTHIA','ANGELA','MELISSA', - 'BRENDA','AMY','GREGORY','ANNA','JOSHUA','JERRY','REBECCA','VIRGINIA','KATHLEEN','PAMELA', - 'DENNIS','MARTHA','DEBRA','AMANDA','STEPHANIE','WALTER','PATRICK','CAROLYN','CHRISTINE', - 'PETER','MARIE','JANET','CATHERINE','HAROLD','FRANCES','DOUGLAS','HENRY','ANN','JOYCE', - 'DIANE','ALICE','JULIE','CARL','HEATHER'); - $users_count = 0; - $users = array(); - - shuffle($lastnames); - shuffle($firstnames); - - $next_user_id = $DB->get_field_sql("SELECT MAX(id) FROM {user}") + 1; - - for ($i = 0; $i < $this->get('number_of_students'); $i++) { - - $lastname = trim(ucfirst(strtolower($lastnames[rand(0, count($lastnames) - 1)]))); - $firstname = $firstnames[rand(0, count($firstnames) - 1)]; - - $user = new stdClass(); - $user->firstname = trim(ucfirst(strtolower($firstname))); - $user->username = strtolower(substr($firstname, 0, 7) . substr($lastname, 0, 7)) . $next_user_id++; - $user->lastname = $lastname; - $user->email = $user->username . '@example.com'; - $user->mnethostid = 1; - $user->city = 'Test City'; - $user->country = 'AU'; - $user->password = md5('password'); - $user->auth = 'manual'; - $user->confirmed = 1; - $user->lang = $CFG->lang; - $user->timemodified= time(); - - $user->id = $DB->insert_record("user", $user); - $users_count++; - $users[] = $user->id; - $next_user_id = $user->id + 1; - $this->verbose("Inserted $user->firstname $user->lastname into DB " - ."(username=$user->username, password=password)."); - } - - if (!$this->get('quiet')) { - echo "$users_count users correctly inserted in the database.{$this->eolchar}"; - } - return $users; - } - - public function generate_data() { - if (!$this->do_generation) { - return false; - } - - set_time_limit($this->get('time_limit')); - - // Process tiny data set - $tiny = $this->get('tiny'); - if (!empty($tiny)) { - $this->verbose("Generating a tiny data set: 1 student in 1 course with 1 module in 1 section..."); - $this->set('number_of_courses',1); - $this->set('number_of_students',1); - $this->set('number_of_modules',1); - $this->set('number_of_sections',1); - $this->set('assignment_grades',false); - $this->set('quiz_grades',false); - $this->set('students_per_course',1); - $this->set('questions_per_course',1); - $this->set('questions_per_quiz',1); - } - - if ($this->get('pre_cleanup')) { - $this->verbose("Deleting previous test data..."); - $this->data_cleanup(); - - if (!$this->get('quiet')) { - echo "Previous test data has been deleted.{$this->eolchar}"; - } - } - - - if (!$this->get('no_data')) { - $users = $this->generate_users(); - $courses = $this->generate_courses(); - $modules = $this->generate_modules($courses); - $questions = $this->generate_questions($courses, $modules); - $course_users = $this->generate_role_assignments($users, $courses); - $this->generate_forum_posts($course_users, $modules); - $this->generate_grades($course_users, $courses, $modules); - $this->generate_module_content($course_users, $courses, $modules); - } - - if ($this->get('post_cleanup')) { - if (!$this->get('quiet')) { - echo "Removing generated data..." . $this->eolchar; - } - $this->data_cleanup(); - if (!$this->get('quiet')) { - echo "Generated data has been deleted." . $this->eolchar; - } - } - - /** - * FINISHING SCRIPT - */ - $stoptimer = time()+microtime(); - $timer = round($stoptimer-$this->starttime,4); - if (!$this->get('quiet')) { - echo "End of script! ($timer seconds taken){$this->eolchar}"; - } - - } - - public function generate_courses() { - global $DB; - - $this->verbose("Generating " . $this->get('number_of_courses')." courses..."); - $base_course = new stdClass(); - $next_course_id = $DB->get_field_sql("SELECT MAX(id) FROM {course}") + 1; - - $base_course->MAX_FILE_SIZE = '2097152'; - $base_course->category = '1'; - $base_course->summary = 'Blah Blah'; - $base_course->format = 'weeks'; - $base_course->numsections = '10'; - $base_course->startdate = time(); - $base_course->id = '0'; - - $courses_count = 0; - $courses = array(); - for ($i = 1; $i <= $this->get('number_of_courses'); $i++) { - $newcourse = fullclone($base_course); - $newcourse->fullname = "Test course $next_course_id"; - $newcourse->shortname = "Test $next_course_id"; - $newcourse->idnumber = $next_course_id; - if (!$course = create_course($newcourse)) { - $this->verbose("Error inserting a new course in the database!"); - if (!$this->get('ignore_errors')) { - die(); - } - } else { - $courses_count++; - $next_course_id++; - $courses[] = $course->id; - $next_course_id = $course->id + 1; - $this->verbose("Inserted $course->fullname into DB (idnumber=$course->idnumber)."); - } - } - - if (!$this->get('quiet')) { - echo "$courses_count test courses correctly inserted into the database.{$this->eolchar}"; - } - return $courses; - } - - public function generate_modules($courses) { - global $DB, $CFG; - // Parse the modules-list variable - - $this->verbose("Generating " . $this->get('number_of_sections')." sections with " - .$this->get('number_of_modules')." modules in each section, for each course..."); - - list($modules_list_sql, $modules_params) = - $DB->get_in_or_equal($this->get('modules_list'), SQL_PARAMS_NAMED, 'mod', true); - - list($modules_ignored_sql, $ignore_params) = - $DB->get_in_or_equal($this->modules_to_ignore, SQL_PARAMS_NAMED, 'ignore', false); - - $wheresql = "name $modules_list_sql AND name $modules_ignored_sql"; - $modules = $DB->get_records_select('modules', $wheresql, array_merge($modules_params, $ignore_params)); - - foreach ($modules as $key => $module) { - $module->count = 0; - - // Scorm, lams and hotpot are too complex to set up, remove them - if (in_array($module->name, $this->modules_to_ignore) || - !in_array($module->name, $this->modules_list)) { - unset($modules[$key]); - } - } - - // Dirty hack for renumbering the modules array's keys - $first_module = reset($modules); - array_shift($modules); - array_unshift($modules, $first_module); - - $modules_array = array(); - - if (count($courses) > 0) { - $libraries = array(); - foreach ($courses as $courseid) { - - // Text resources - for ($i = 1; $i <= $this->get('number_of_sections'); $i++) { - for ($j = 0; $j < $this->get('number_of_modules'); $j++) { - - $module = new stdClass(); - - // If only one module is created, and we also need to add a question to a quiz, create only a quiz - if ($this->get('number_of_modules') == 1 - && $this->get('questions_per_quiz') > 0 - && !empty($modules[8])) { - $moduledata = $modules[8]; - } else { - $moduledata = $modules[array_rand($modules)]; - } - - $libfile = "$CFG->dirroot/mod/$moduledata->name/lib.php"; - if (file_exists($libfile)) { - if (!in_array($libfile, $libraries)) { - $this->verbose("Including library for $moduledata->name..."); - $libraries[] = $libfile; - require_once($libfile); - } - } else { - $this->verbose("Could not load lib file for module $moduledata->name!"); - if (!$this->get('ignore_errors')) { - die(); - } - } - - // Basically 2 types of text fields: description and content - $description = "This $moduledata->name has been randomly generated by a very useful script, " - . "for the purpose of testing " - . "the boundaries of Moodle in various contexts. Moodle should be able to scale to " - . "any size without " - . "its speed and ease of use being affected dramatically."; - $content = 'Very useful content, I am sure you would agree'; - - $module_type_index = 0; - $module->introformat = FORMAT_MOODLE; - $module->messageformat = FORMAT_MOODLE; - - // Special module-specific config - switch ($moduledata->name) { - case 'assignment': - $module->intro = $description; - $module->assignmenttype = $this->get_module_type('assignment'); - $module->timedue = time() + 89487321; - $module->grade = rand(50,100); - break; - case 'chat': - $module->intro = $description; - $module->schedule = 1; - $module->chattime = 60 * 60 * 4; - break; - case 'data': - $module->intro = $description; - $module->name = 'test'; - break; - case 'choice': - $module->intro = $description; - $module->text = $content; - $module->option = array('Good choice', 'Bad choice', 'No choice'); - $module->limit = array(1, 5, 0); - break; - case 'comments': - $module->intro = $description; - $module->comments = $content; - break; - case 'feedback': - $module->intro = $description; - $module->page_after_submit = $description; - $module->comments = $content; - break; - case 'forum': - $module->intro = $description; - $module->type = $this->get_module_type('forum'); - $module->forcesubscribe = rand(0, 1); - $module->format = 1; - break; - case 'glossary': - $module->intro = $description; - $module->displayformat = $this->glossary_formats[rand(0, count($this->glossary_formats) - 1)]; - $module->cmidnumber = rand(0,999999); - break; - case 'label': - $module->content = $content; - $module->intro = $description; - break; - case 'lesson': - $module->lessondefault = 1; - $module->available = time(); - $module->deadline = time() + 719891987; - $module->grade = 100; - break; - case 'quiz': - $module->intro = $description; - $module->feedbacktext = 'blah'; - $module->feedback = 1; - $module->feedbackboundaries = array(2, 1); - $module->grade = 10; - $module->timeopen = time(); - $module->timeclose = time() + 68854; - $module->shufflequestions = true; - $module->shuffleanswers = true; - $module->quizpassword = ''; - break; - case 'resource': - $module->type = $this->get_module_type('resource'); - $module->alltext = $content; - $module->summary = $description; - $module->windowpopup = rand(0,1); - $module->display = rand(0,1); - $module->resizable = rand(0,1); - $module->scrollbars = rand(0,1); - $module->directories = rand(0,1); - $module->location = 'file.txt'; - $module->menubar = rand(0,1); - $module->toolbar = rand(0,1); - $module->status = rand(0,1); - $module->width = rand(200,600); - $module->height = rand(200,600); - $module->directories = rand(0,1); - $module->files = false; - $module->param_navigationmenu = rand(0,1); - $module->param_navigationbuttons = rand(0,1); - $module->reference = 1; - $module->forcedownload = 1; - break; - case 'survey': - $module->template = rand(1,5); - $module->intro = $description; - break; - case 'wiki': - $module->intro = $description; - $module->summary = $description; - break; - } - - $module->name = ucfirst($moduledata->name) . ' ' . $moduledata->count++; - - $module->course = $courseid; - $module->section = 0; - $module->module = $moduledata->id; - $module->modulename = $moduledata->name; - $module->add = $moduledata->name; - $module->cmidnumber = ''; - $module->coursemodule = ''; - $add_instance_function = $moduledata->name . '_add_instance'; - - $module->coursemodule = add_course_module($module); - - if (function_exists($add_instance_function)) { - $this->verbose("Calling module function $add_instance_function"); - $module->instance = $add_instance_function($module, ''); - $DB->set_field('course_modules', 'instance', $module->instance, array('id'=>$module->coursemodule)); - } else { - $this->verbose("Function $add_instance_function does not exist!"); - if (!$this->get('ignore_errors')) { - die(); - } - } - - $module->section = course_add_cm_to_section($courseid, $module->coursemodule, $i); - - $module->cmidnumber = set_coursemodule_idnumber($module->coursemodule, ''); - - $this->verbose("A $moduledata->name module was added to section $i (id $module->section) " - ."of course $courseid."); - - $module_instance = $DB->get_field('course_modules', 'instance', array('id' => $module->coursemodule)); - $module_record = $DB->get_record($moduledata->name, array('id' => $module_instance)); - $module_record->instance = $module_instance; - - if (empty($modules_array[$moduledata->name])) { - $modules_array[$moduledata->name] = array(); - } - - // TODO Find out why some $module_record end up empty here... (particularly quizzes) - if (!empty($module_record->instance)) { - $modules_array[$moduledata->name][] = $module_record; - } - } - } - } - - if (!$this->get('quiet')) { - echo "Successfully generated " . $this->get('number_of_modules') * $this->get('number_of_sections') - . " modules in each course!{$this->eolchar}"; - } - - return $modules_array; - } - return null; - } - - public function generate_questions($courses, $modules) { - global $DB, $CFG; - - if (!is_null($this->get('questions_per_course')) && count($courses) > 0 && is_array($courses)) { - require_once($CFG->libdir .'/questionlib.php'); - require_once($CFG->dirroot .'/mod/quiz/editlib.php'); - $questions = array(); - $questionsmenu = question_bank::get_creatable_qtypes(); - $questiontypes = array(); - foreach ($questionsmenu as $qtype => $qname) { - $questiontypes[] = $qtype; - } - - // Add the questions - foreach ($courses as $courseid) { - $questions[$courseid] = array(); - for ($i = 0; $i < $this->get('questions_per_course'); $i++) { - $qtype = $questiontypes[array_rand($questiontypes)]; - - // Only the following types are supported right now. Hang around for more! - $supported_types = array('match', 'essay', 'multianswer', 'multichoice', 'shortanswer', - 'numerical', 'truefalse', 'calculated'); - $qtype = $supported_types[array_rand($supported_types)]; - - if ($qtype == 'calculated') { - continue; - } - $classname = "question_{$qtype}_qtype"; - if ($qtype == 'multianswer') { - $classname = "embedded_cloze_qtype"; - } - - $question = new $classname(); - $question->qtype = $qtype; - $questions[$courseid][] = $question->generate_test("question$qtype-$i", $courseid); - $this->verbose("Generated a question of type $qtype for course id $courseid."); - } - } - - // Assign questions to quizzes, if such exist - if (!empty($modules['quiz']) && !empty($questions) && !is_null($this->get('questions_per_quiz'))) { - $quizzes = $modules['quiz']; - - // Cannot assign more questions per quiz than are available, so determine which is the largest - $questions_per_quiz = max(count($questions), $this->get('questions_per_quiz')); - - foreach ($quizzes as $quiz) { - $questions_added = array(); - for ($i = 0; $i < $questions_per_quiz; $i++) { - - // Add a random question to the quiz - do { - if (empty($quiz->course)) { - print_object($quizzes);die(); - } - $random = rand(0, count($questions[$quiz->course])); - } while (in_array($random, $questions_added) || !array_key_exists($random, $questions[$quiz->course])); - - if (!quiz_add_quiz_question($questions[$quiz->course][$random]->id, $quiz)) { - - // Could not add question to quiz!! report error - if (!$this->get('quiet')) { - echo "WARNING: Could not add question id $random to quiz id $quiz->id{$this->eolchar}"; - } - } else { - $this->verbose("Adding question id $random to quiz id $quiz->id."); - $questions_added[] = $random; - } - } - } - } - return $questions; - } - return null; - } - - public function generate_role_assignments($users, $courses) { - global $CFG, $DB; - $course_users = array(); - - if (count($courses) > 0) { - $this->verbose("Inserting student->course role assignments..."); - $assigned_count = 0; - $assigned_users = array(); - - foreach ($courses as $courseid) { - $course_users[$courseid] = array(); - - // Select $students_per_course for assignment to course - shuffle($users); - $users_to_assign = array_slice($users, 0, $this->get('students_per_course')); - - $context = context_course::instance($courseid); - foreach ($users_to_assign as $random_user) { - role_assign(5, $random_user, $context->id); - - $assigned_count++; - $course_users[$courseid][] = $random_user; - if (!isset($assigned_users[$random_user])) { - $assigned_users[$random_user] = 1; - } else { - $assigned_users[$random_user]++; - } - $this->verbose("Student $random_user was assigned to course $courseid."); - } - } - - if (!$this->get('quiet')) { - echo "$assigned_count user => course role assignments have been correctly performed.{$this->eolchar}"; - } - return $course_users; - } - return null; - } - - public function generate_forum_posts($course_users, $modules) { - global $CFG, $DB, $USER; - - if (in_array('forum', $this->modules_list) && - $this->get('discussions_per_forum') && - $this->get('posts_per_discussion') && - isset($modules['forum'])) { - - $discussions_count = 0; - $posts_count = 0; - - foreach ($modules['forum'] as $forum) { - $forum_users = $course_users[$forum->course]; - - for ($i = 0; $i < $this->get('discussions_per_forum'); $i++) { - $mform = new fake_form(); - - require_once($CFG->dirroot.'/mod/forum/lib.php'); - - $discussion = new stdClass(); - $discussion->course = $forum->course; - $discussion->forum = $forum->id; - $discussion->name = 'Test discussion'; - $discussion->intro = 'This is just a test forum discussion'; - $discussion->assessed = 0; - $discussion->messageformat = 1; - $discussion->messagetrust = 0; - $discussion->mailnow = false; - $discussion->groupid = -1; - $discussion->attachments = null; - $discussion->itemid = 752157083; - - $message = ''; - $super_global_user = clone($USER); - $user_id = $forum_users[array_rand($forum_users)]; - $USER = $DB->get_record('user', array('id' => $user_id)); - - if ($discussion_id = forum_add_discussion($discussion, $mform, $message)) { - $discussion = $DB->get_record('forum_discussions', array('id' => $discussion_id)); - $discussions_count++; - - // Add posts to this discussion - $post_ids = array($discussion->firstpost); - - for ($j = 0; $j < $this->get('posts_per_discussion'); $j++) { - $global_user = clone($USER); - $user_id = $forum_users[array_rand($forum_users)]; - $USER = $DB->get_record('user', array('id' => $user_id)); - $post = new stdClass(); - $post->discussion = $discussion_id; - $post->subject = 'Re: test discussion'; - $post->message = '
Nothing much to say, since this is just a test...
'; - $post->format = 1; - $post->attachments = null; - $post->itemid = 752157083; - $post->parent = $post_ids[array_rand($post_ids)]; - - if ($post_ids[] = forum_add_new_post($post, $mform, $message)) { - $posts_count++; - } - $USER = $global_user; - } - } - - $USER = $super_global_user; - - if ($forum->type == 'single') { - break; - } - } - } - if ($discussions_count > 0 && !$this->get('quiet')) { - echo "$discussions_count forum discussions have been generated.{$this->eolchar}"; - } - if ($posts_count > 0 && !$this->get('quiet')) { - echo "$posts_count forum posts have been generated.{$this->eolchar}"; - } - - return true; - } - return null; - - } - - public function generate_grades($course_users, $courses, $modules) { - global $CFG, $DB, $USER; - - /** - * ASSIGNMENT GRADES GENERATION - */ - if ($this->get('assignment_grades') && isset($modules['assignment'])) { - $grades_count = 0; - foreach ($course_users as $courseid => $userid_array) { - foreach ($userid_array as $userid) { - foreach ($modules['assignment'] as $assignment) { - if (in_array($assignment->course, $courses)) { - $maxgrade = $assignment->grade; - $random_grade = rand(0, $maxgrade); - $grade = new stdClass(); - $grade->assignment = $assignment->id; - $grade->userid = $userid; - $grade->grade = $random_grade; - $grade->rawgrade = $random_grade; - $grade->teacher = $USER->id; - $grade->submissioncomment = 'comment'; - $DB->insert_record('assignment_submissions', $grade); - grade_update('mod/assignment', $assignment->course, 'mod', 'assignment', $assignment->id, 0, $grade); - $this->verbose("A grade ($random_grade) has been given to user $userid " - . "for assignment $assignment->id"); - $grades_count++; - } - } - } - } - if ($grades_count > 0) { - $this->verbose("$grades_count assignment grades have been generated.{$this->eolchar}"); - } - } - - /** - * QUIZ GRADES GENERATION - */ - if ($this->get('quiz_grades') && isset($modules['quiz'])) { - $grades_count = 0; - foreach ($course_users as $userid => $courses) { - foreach ($modules['quiz'] as $quiz) { - if (in_array($quiz->course, $courses)) { - $maxgrade = $quiz->grade; - $random_grade = rand(0, $maxgrade); - $grade = new stdClass(); - $grade->quiz = $quiz->id; - $grade->userid = $userid; - $grade->grade = $random_grade; - $grade->rawgrade = $random_grade; - $DB->insert_record('quiz_grades', $grade); - grade_update('mod/quiz', $courseid, 'mod', 'quiz', $quiz->id, 0, $grade); - $this->verbose("A grade ($random_grade) has been given to user $userid for quiz $quiz->id"); - $grades_count++; - } - } - } - if ($grades_count > 0 && !$this->get('quiet')) { - echo "$grades_count quiz grades have been generated.{$this->eolchar}"; - } - } - return null; - } - - public function generate_module_content($course_users, $courses, $modules) { - global $USER, $DB, $CFG; - $result = null; - - $entries_count = 0; - if ($this->get('entries_per_glossary') && !empty($modules['glossary'])) { - foreach ($modules['glossary'] as $glossary) { - for ($i = 0; $i < $this->get('entries_per_glossary'); $i++) { - $entry = new stdClass(); - $entry->glossaryid = $glossary->id; - $entry->userid = $USER->id; - $entry->concept = "Test concept"; - $entry->definition = "A test concept is nothing to write home about: just a test concept."; - $entry->format = 1; - $entry->timecreated = time(); - $entry->timemodified = time(); - $entry->teacherentry = 0; - $entry->approved = 1; - $DB->insert_record('glossary_entries', $entry); - $entries_count++; - } - } - if ($entries_count > 0 && !$this->get('quiet')) { - echo "$entries_count glossary definitions have been generated.{$this->eolchar}"; - } - $result = true; - } - - $fields_count = 0; - if (!empty($modules['data']) && $this->get('fields_per_database') && $this->get('database_records_per_student')) { - $database_field_types = array('checkbox', - 'date', - 'file', - 'latlong', - 'menu', - 'multimenu', - 'number', - 'picture', - 'radiobutton', - 'text', - 'textarea', - 'url'); - - - $fields = array(); - - foreach ($modules['data'] as $data) { - - for ($i = 0; $i < $this->get('fields_per_database'); $i++) { - $type = $database_field_types[array_rand($database_field_types)]; - require_once($CFG->dirroot.'/mod/data/field/'.$type.'/field.class.php'); - $newfield = 'data_field_'.$type; - $cm = get_coursemodule_from_instance('data', $data->id); - $newfield = new $newfield(0, $data, $cm); - $fields[$data->id][] = $newfield; - $newfield->insert_field(); - } - - // Generate fields for each database (same fields for all, no arguing) - for ($i = 0; $i < $this->get('fields_per_database'); $i++) { - - } - - // Generate database records for each student, if needed - for ($i = 0; $i < $this->get('database_records_per_student'); $i++) { - - } - } - if ($fields_count > 0 && !$this->get('quiet')) { - $datacount = count($modules['data']); - echo "$fields_count database fields have been generated for each of the " - . "$datacount generated databases.{$this->eolchar}"; - } - $result = true; - } - - $messages_count = 0; - if (!empty($modules['chat']) && $this->get('messages_per_chat')) { - - // Insert all users into chat_users table, then a message from each user - foreach ($modules['chat'] as $chat) { - - foreach ($course_users as $courseid => $users_array) { - - foreach ($users_array as $userid) { - if ($messages_count < $this->get('messages_per_chat')) { - $chat_user = new stdClass(); - $chat_user->chatid = $chat->id; - $chat_user->userid = $userid; - $chat_user->course = $courseid; - $DB->insert_record('chat_users', $chat_user); - - $chat_message = new stdClass(); - $chat_message->chatid = $chat->id; - $chat_message->userid = $userid; - $chat_message->message = "Hi, everyone!"; - $DB->insert_record('chat_messages', $chat_message); - - $messages_count++; - } - } - } - } - - if ($messages_count > 0 && !$this->get('quiet')) { - $datacount = count($modules['chat']); - echo "$messages_count messages have been generated for each of the " - . "$datacount generated chats.{$this->eolchar}"; - } - $result = true; - } - - return $result; - } - - - /** - * If verbose is switched on, prints a string terminated by the global eolchar string. - * @param string $string The string to STDOUT - */ - public function verbose($string) { - if ($this->get('verbose') && !$this->get('quiet')) { - echo $string . $this->eolchar; - } - } - - - /** - * Attempts to delete all generated test data. - * WARNING: THIS WILL COMPLETELY MESS UP A "REAL" SITE, AND IS INTENDED ONLY FOR DEVELOPMENT PURPOSES - */ - function data_cleanup() { - global $DB; - - if ($this->get('quiet')) { - ob_start(); - } - - // TODO Cleanup code - - if ($this->get('quiet')) { - ob_end_clean(); - } - } - - public function get($setting) { - if (isset($this->settings[$setting])) { - return $this->settings[$setting]->value; - } else { - return null; - } - } - - public function set($setting, $value) { - if (isset($this->settings[$setting])) { - $this->settings[$setting]->value = $value; - } else { - return false; - } - } - - public function get_module_type($modulename) { - $return_val = false; - - $type = $this->get($modulename.'_type'); - - if (is_object($type) && isset($type->type) && isset($type->options)) { - - if ($type->type == GENERATOR_RANDOM) { - $return_val = $type->options[array_rand($type->options)]; - - } elseif ($type->type == GENERATOR_SEQUENCE) { - $return_val = $type->options[$this->{$modulename.'_type_counter'}]; - $this->{$modulename.'_type_counter'}++; - - if ($this->{$modulename.'_type_counter'} == count($type->options)) { - $this->{$modulename.'_type_counter'} = 0; - } - } - - } elseif (is_array($type)) { - $return_val = $type[array_rand($type)]; - - } elseif (is_string($type)) { - $return_val = $type; - } - - return $return_val; - } -} - -class generator_argument { - public $short; - public $long; - public $help; - public $type; - public $default = null; - public $value; - - public function __construct($params) { - foreach ($params as $key => $val) { - $this->$key = $val; - } - $this->value = $this->default; - } -} - -class generator_cli extends generator { - public $eolchar = "\n"; - - public function __construct($settings, $argc) { - parent::__construct(); - - // Building the USAGE output of the command line version - $help = "Moodle Data Generator. Generates Data for Moodle sites. Good for benchmarking and other tests.\n\n" - . "FOR DEVELOPMENT PURPOSES ONLY! DO NOT USE ON A PRODUCTION SITE!\n\n" - . "Note: By default the script attempts to fill DB tables prefixed with tst_\n" - . "To override the prefix, use the -P (--database_prefix) setting.\n\n" - . "Usage: {$settings[0]}; [OPTION] ...\n" - . "Options:\n" - . " -h, -?, -help, --help This output\n"; - - foreach ($this->settings as $argument) { - $equal = ''; - if (!empty($argument->type)) { - $equal = "={$argument->type}"; - } - - $padding1 = 5 - strlen($argument->short); - $padding2 = 30 - (strlen($argument->long) + strlen($equal)); - $paddingstr1 = ''; - for ($i = 0; $i < $padding1; $i++) { - $paddingstr1 .= ' '; - } - $paddingstr2 = ''; - for ($i = 0; $i < $padding2; $i++) { - $paddingstr2 .= ' '; - } - - $help .= " -{$argument->short},$paddingstr1--{$argument->long}$equal$paddingstr2{$argument->help}\n"; - } - - $help .= "\nUse http://tracker.moodle.org for any suggestions or bug reports.\n"; - - if ($argc == 1 || in_array($settings[1], array('--help', '-help', '-h', '-?'))) { - echo $help; - die(); - - } else { - $this->do_generation = true; - $settings = $this->_arguments($settings); - $argscount = 0; - - foreach ($this->settings as $argument) { - $value = null; - - if (in_array($argument->short, array_keys($settings))) { - $value = $settings[$argument->short]; - unset($settings[$argument->short]); - - } elseif (in_array($argument->long, array_keys($settings))) { - $value = $settings[$argument->long]; - unset($settings[$argument->long]); - } - - if (!is_null($value)) { - - if (!empty($argument->type) && ($argument->type == 'mod1,mod2...' || $argument->type == 'SELECT')) { - $value = explode(',', $value); - } - - $this->set($argument->long, $value); - $argscount++; - } - } - - // If some params are left in argv, it means they are not supported - if ($argscount == 0 || count($settings) > 0) { - echo $help; - die(); - } - } - - $this->connect(); - } - - public function generate_data() { - if (is_null($this->get('username')) || $this->get('username') == '') { - echo "You must enter a valid username for a moodle administrator account on this site.{$this->eolchar}"; - die(); - } elseif (is_null($this->get('password')) || $this->get('password') == '') { - echo "You must enter a valid password for a moodle administrator account on this site.{$this->eolchar}"; - die(); - } else { - if (!$user = authenticate_user_login($this->get('username'), $this->get('password'))) { - echo "Invalid username or password!{$this->eolchar}"; - die(); - } - if (!is_siteadmin($user)) {//TODO: add some proper access control check here!! - echo "You do not have administration privileges on this Moodle site. " - ."These are required for running the generation script.{$this->eolchar}"; - die(); - } - complete_user_login($user); - } - - parent::generate_data(); - } - - /** - * Converts the standard $argv into an associative array taking var=val arguments into account - * @param array $argv - * @return array $_ARG - */ - private function _arguments($argv) { - $_ARG = array(); - foreach ($argv as $arg) { - if (preg_match('/--?([^=]+)=(.*)/',$arg,$reg)) { - $_ARG[$reg[1]] = $reg[2]; - } elseif(preg_match('/-([a-zA-Z0-9]+)/',$arg,$reg)) { - $_ARG[$reg[1]] = 'true'; - } - } - return $_ARG; - } -} - -class generator_web extends generator { - public $eolchar = ''; - public $mform; - - public function setup() { - global $CFG; - $this->mform = new generator_form(); - - if ($data = $this->mform->get_data(false)) { - $this->do_generation = optional_param('do_generation', false, PARAM_BOOL); - foreach ($this->settings as $setting) { - if (isset($data->{$setting->long})) { - $this->set($setting->long, $data->{$setting->long}); - } - } - } else { - $this->do_generation = false; - } - } - - public function display() { - global $OUTPUT, $PAGE; - $PAGE->set_title("Data generator"); - echo $OUTPUT->header(); - echo $OUTPUT->heading("Data generator: web interface"); - echo $OUTPUT->heading("FOR DEVELOPMENT PURPOSES ONLY. DO NOT USE ON A PRODUCTION SITE!", 3); - echo $OUTPUT->heading("Your database contents will probably be massacred. You have been warned", 5); - - $this->mform->display(); - $this->connect(); - } - - public function complete() { - global $OUTPUT; - $this->dispose(); - echo $OUTPUT->footer(); - } -} - -class generator_silent extends generator { - -} - -function generator_generate_data($settings) { - $generator = new generator($settings); - $generator->do_generation = true; - $generator->generate_data(); -} - -class fake_form { - function get_new_filename($string) { - return false; - } - - function save_stored_file() { - return true; - } - - function get_data() { - return array(); - } -} - -class generator_form extends moodleform { - function definition() { - global $generator, $CFG; //TODO: sloppy coding style!! - - $mform =& $this->_form; - $mform->addElement('hidden', 'do_generation', 1); - $mform->setType('do_generation', PARAM_INT); - - foreach ($generator->settings as $setting) { - $type = 'advcheckbox'; - $options = null; - $htmloptions = null; - - $label = ucfirst(str_replace('_', ' ', $setting->long)); - if (!empty($setting->type) && $setting->type == 'mod1,mod2...') { - $type = 'select'; - $options = $generator->modules_list; - $htmloptions = array('multiple' => 'multiple'); - } elseif (!empty($setting->type) && $setting->type == 'SELECT') { - $type = 'select'; - $options = array(); - foreach ($setting->default as $option) { - $options[$option] = $option; - } - $htmloptions = array('multiple' => 'multiple'); - } elseif (!empty($setting->type)) { - $type = 'text'; - } - - if ($setting->long == 'password' || $setting->long == 'username') { - continue; - } - - $mform->addElement($type, $setting->long, $label, $options, $htmloptions); - - if (isset($setting->default)) { - $mform->setDefault($setting->long, $setting->default); - } - } - $this->add_action_buttons(false, 'Generate data!'); - } - - function definition_after_data() { - - } -} diff --git a/admin/tool/generator/maketestcourse.php b/admin/tool/generator/maketestcourse.php index 82af097cb8f..a7b760bd63d 100644 --- a/admin/tool/generator/maketestcourse.php +++ b/admin/tool/generator/maketestcourse.php @@ -15,8 +15,7 @@ // along with Moodle. If not, see
true
+ ' +
- ''+f.text+""+"
")),M.editor_atto.buttonhandlers[n+"_action_"+a]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+a),M.editor_atto.buttonhandlers[n+"_action_"+a]=f.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var l=new M.core.dialogue({bodyContent:u,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,centered:!1,align:{node:o,points:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]}});M.editor_atto.menus[n+"_"+t]=l,l.render(),l.hide(),l.headerNode.hide()},add_toolbar_button:function(t,n,r,i){var s=e.one("#"+t+"_toolbar"),o=e.Node.create('");s.append(o),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=i),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.one("#"+t.elementid),r=e.Node.create(''),i="",s=e.Node.create(''),o=e.io(t.content_css,{sync:!0}),u=o.responseText.indexOf("font:");u&&(i=o.responseText.substring(u+"font:".length,o.responseText.length-1),r.setStyle("font",i)),r.setStyle("minHeight",1.2*(n.getAttribute("rows")-1)+"em"),r.append(n.get("value")),n.get("parentNode").insert(s,n),n.get("parentNode").insert(r,n),r.setStyle("color",n.getStyle("color")),r.setStyle("lineHeight",n.getStyle("lineHeight")),r.setStyle("fontSize",n.getStyle("fontSize")),n.hide(),r.on("blur",function(){n.set("value",r.getHTML())}),M.editor_atto.filepickeroptions[t.elementid]=t.filepickeroptions},show_filepicker:function(t,n,r){e.use("core_filepicker",function(e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n' +
- '
';
@@ -62,13 +74,80 @@ M.core_backup.select_all_init = function(str) {
}
});
- var html = html_generator('include_setting section_level', 'included');
+ // Add global select all/none options.
+ var html = html_generator('include_setting section_level', 'included', M.util.get_string('select', 'moodle'),
+ ' (' + M.util.get_string('showtypes', 'backup') + ')');
if (withuserdata) {
- html += html_generator('normal_setting', 'userdata');
+ html += html_generator('normal_setting', 'userdata', M.util.get_string('select', 'moodle'));
}
var links = Y.Node.create('' + str.select + '
' +
+ '' +
+ '
' +
'' + heading + '
' +
'' +
- '' + str.all + ' / ' +
- '' + str.none + '' +
+ '' + M.util.get_string('all', 'moodle') + ' / ' +
+ '' + M.util.get_string('none', 'moodle') + '' +
+ extra +
'
' +
'' + html + '
');
firstsection.insert(links, 'before');
+ // Add select all/none for each module type.
+ var initlinks = function(links, mod) {
+ Y.one('#backup-all-mod_' + mod).on('click', function(e) { helper(e, true, '_included', mod); });
+ Y.one('#backup-none-mod_' + mod).on('click', function(e) { helper(e, false, '_included', mod); });
+ if (withuserdata) {
+ Y.one('#backup-all-userdata-mod_' + mod).on('click', function(e) { helper(e, true, withuserdata, mod); });
+ Y.one('#backup-none-userdata-mod_' + mod).on('click', function(e) { helper(e, false, withuserdata, mod); });
+ }
+ };
+
+ // For each module type on the course, add hidden select all/none options.
+ var modlist = Y.Node.create('');
+ modlist.hide();
+ modlist.currentlyshown = false;
+ links.appendChild(modlist);
+ for (var mod in modnames) {
+ // Only include actual values from the list.
+ if (!modnames.hasOwnProperty(mod)) {
+ continue;
+ }
+ var html = html_generator('include_setting section_level', 'mod_' + mod, modnames[mod]);
+ if (withuserdata) {
+ html += html_generator('normal_setting', 'userdata-mod_' + mod, modnames[mod]);
+ }
+ var modlinks = Y.Node.create(
+ '
');
+ Y.one('#connection-status').removeClass('notconnected').addClass('connecting').setHTML(loading);
+ break;
+ case 'notconnected':
+ var notconnected = M.util.get_string('notconnected', 'badges');;
+ Y.one('#connection-status').removeClass('connecting').addClass('notconnected').setHTML(notconnected);
+ break;
+ default:
+ // Unknown status, do nothing.
+ }
+}
+
+/*
+ * Print an error message at the top of the page.
+ */
+function badges_set_error_message(messagekey, param) {
+ var errortext = M.util.get_string(messagekey, 'badges', param);
+ Y.one('#connection-error').setHTML(errortext);
+}
+
+/*
+ * Handle the assertion generated by the Persona dialog.
+ */
+function badges_handle_assertion(assertion) {
+
+ if (!assertion) {
+ var noassertionstr = M.util.get_string('error:noassertion', 'badges');
+ badges_set_error_message('error:backpackloginfailed', noassertionstr);
+ return;
+ }
+
+ badges_set_connection_progress('connecting');
+
+ Y.io("backpackconnect.php", {
+ method: "POST",
+ data: "assertion="+assertion+"&sesskey="+M.cfg.sesskey,
+ on: {
+ success: function (id, result) {
+ // Reload page to display connected email address.
+ window.location.href = "mybackpack.php";
+ },
+ failure: function (id, result) {
+ try {
+ var parsedResponse = Y.JSON.parse(result.response);
+ } catch (e) {
+ badges_set_connection_progress('notconnected');
+ var badjsonstr = M.util.get_string('error:badjson', 'badges');
+ badges_set_error_message('error:backpackloginfailed', badjsonstr);
+ return;
+ }
+ badges_set_connection_progress('notconnected');
+ badges_set_error_message('error:backpackloginfailed', parsedResponse.reason);
+ return;
+ }
+ }
+ });
+}
+
+/**
+ * Create and bind the persona login button.
+ */
+function badges_init_persona_login_button() {
+ // Create the login button and add to the page via Javascript.
+ var imageurl = M.util.image_url('i/persona_sign_in_black', 'moodle');
+ var imagealt = M.util.get_string('signinwithyouremail', 'badges');
+ var button = Y.Node.create('');
+ Y.one('#persona-container').append(button);
+
+ // Bind a click event to trigger login when clicked.
+ button.on('click', function() {
+ Y.one('#connection-error').empty();
+ navigator.id.get(badges_handle_assertion);
+ });
+}
diff --git a/badges/backpack_form.php b/badges/backpack_form.php
index dce06305ec1..ad9d427feb1 100644
--- a/badges/backpack_form.php
+++ b/badges/backpack_form.php
@@ -39,28 +39,37 @@ class edit_backpack_form extends moodleform {
* Defines the form
*/
public function definition() {
- global $USER;
+ global $USER, $PAGE, $OUTPUT;
$mform = $this->_form;
+ $mform->addElement('html', html_writer::tag('span', '', array('class' => 'notconnected', 'id' => 'connection-error')));
$mform->addElement('header', 'backpackheader', get_string('backpackconnection', 'badges'));
$mform->addHelpButton('backpackheader', 'backpackconnection', 'badges');
- $mform->addElement('static', 'url', get_string('url'), 'http://backpack.openbadges.org');
- $status = html_writer::tag('span', get_string('notconnected', 'badges'), array('class' => 'notconnected'));
+ $mform->addElement('static', 'url', get_string('url'), BADGE_BACKPACKURL);
+ $status = html_writer::tag('span', get_string('notconnected', 'badges'),
+ array('class' => 'notconnected', 'id' => 'connection-status'));
$mform->addElement('static', 'status', get_string('status'), $status);
- $mform->addElement('text', 'email', get_string('email'), array('size' => '50'));
- $mform->setDefault('email', $USER->email);
- $mform->setType('email', PARAM_RAW);
- $mform->addRule('email', get_string('required'), 'required', null , 'client');
- $mform->addHelpButton('email', 'backpackemail', 'badges');
+ $nojs = html_writer::tag('noscript', get_string('error:personaneedsjs', 'badges'),
+ array('class' => 'notconnected'));
+ $personadiv = $OUTPUT->container($nojs, null, 'persona-container');
+
+ $mform->addElement('static', 'persona', '', $personadiv);
+ $mform->addHelpButton('persona', 'personaconnection', 'badges');
+
+ $PAGE->requires->js(new moodle_url('https://login.persona.org/include.js'));
+ $PAGE->requires->js('/badges/backpack.js');
+ $PAGE->requires->js_init_call('badges_init_persona_login_button', null, false);
+ $PAGE->requires->strings_for_js(array('error:backpackloginfailed', 'signinwithyouremail',
+ 'error:noassertion', 'error:connectionunknownreason', 'error:badjson', 'connecting',
+ 'notconnected'), 'badges');
$mform->addElement('hidden', 'userid', $USER->id);
$mform->setType('userid', PARAM_INT);
- $mform->addElement('hidden', 'backpackurl', 'http://backpack.openbadges.org');
+ $mform->addElement('hidden', 'backpackurl', BADGE_BACKPACKURL);
$mform->setType('backpackurl', PARAM_URL);
- $this->add_action_buttons(true, get_string('connect', 'badges'));
}
/**
@@ -70,18 +79,14 @@ class edit_backpack_form extends moodleform {
global $DB;
$errors = parent::validation($data, $files);
- if (!validate_email($data['email'])) {
- $errors['email'] = get_string('invalidemail');
- } else {
- $check = new stdClass();
- $check->backpackurl = $data['backpackurl'];
- $check->email = $data['email'];
+ $check = new stdClass();
+ $check->backpackurl = $data['backpackurl'];
+ $check->email = $data['email'];
- $bp = new OpenBadgesBackpackHandler($check);
- $request = $bp->curl_request('user');
- if (isset($request->status) && $request->status == 'missing') {
- $errors['email'] = get_string('error:nosuchuser', 'badges');
- }
+ $bp = new OpenBadgesBackpackHandler($check);
+ $request = $bp->curl_request('user');
+ if (isset($request->status) && $request->status == 'missing') {
+ $errors['email'] = get_string('error:nosuchuser', 'badges');
}
return $errors;
}
@@ -113,7 +118,7 @@ class edit_collections_form extends moodleform {
$mform->addElement('header', 'backpackheader', get_string('backpackconnection', 'badges'));
$mform->addHelpButton('backpackheader', 'backpackconnection', 'badges');
- $mform->addElement('static', 'url', get_string('url'), 'http://backpack.openbadges.org');
+ $mform->addElement('static', 'url', get_string('url'), BADGE_BACKPACKURL);
$status = html_writer::tag('span', get_string('connected', 'badges'), array('class' => 'connected'));
$mform->addElement('static', 'status', get_string('status'), $status);
diff --git a/badges/backpackconnect.php b/badges/backpackconnect.php
new file mode 100644
index 00000000000..55bc2ecf0c8
--- /dev/null
+++ b/badges/backpackconnect.php
@@ -0,0 +1,136 @@
+.
+
+/**
+ * AJAX script for validating backpack connection.
+ *
+ * @package core
+ * @subpackage badges
+ * @copyright 2012 onwards Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author Simon Coggins
+ */
+
+define('AJAX_SCRIPT', true);
+
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once($CFG->dirroot . '/badges/lib/backpacklib.php');
+require_once($CFG->libdir . '/filelib.php');
+
+require_sesskey();
+require_login();
+$PAGE->set_url('/badges/backpackconnect.php');
+$PAGE->set_context(context_system::instance());
+
+// Use PHP input filtering as there is no PARAM type for
+// the type of cleaning that is required (ASCII chars 32-127 only).
+$assertion = filter_input(
+ INPUT_POST,
+ 'assertion',
+ FILTER_UNSAFE_RAW,
+ FILTER_FLAG_STRIP_LOW|FILTER_FLAG_STRIP_HIGH
+);
+
+// Audience is the site url scheme + host + port only.
+$wwwparts = parse_url($CFG->wwwroot);
+$audience = $wwwparts['scheme'] . '://' . $wwwparts['host'];
+$audience .= isset($wwwparts['port']) ? $wwwparts['port'] : '';
+$params = 'assertion=' . urlencode($assertion) . '&audience=' .
+ urlencode($audience);
+
+$curl = new curl();
+$url = 'https://verifier.login.persona.org/verify';
+$options = array(
+ 'FRESH_CONNECT' => true,
+ 'RETURNTRANSFER' => true,
+ 'FORBID_REUSE' => true,
+ 'SSL_VERIFYPEER' => true,
+ 'SSL_VERIFYHOST' => 2,
+ 'HEADER' => 0,
+ 'HTTPHEADER' => array('Content-type: application/x-www-form-urlencoded'),
+ 'CONNECTTIMEOUT' => 0,
+ 'TIMEOUT' => 10, // Fail if data not returned within 10 seconds.
+);
+$result = $curl->post($url, $params, $options);
+
+// Handle time-out and failed request.
+if ($curl->errno != 0) {
+ if ($curl->errno == CURLE_OPERATION_TIMEOUTED) {
+ $reason = get_string('error:requesttimeout', 'badges');
+ } else {
+ $reason = get_string('error:requesterror', 'badges', $curl->errno);
+ }
+ badges_send_response('failure', $reason);
+}
+
+$data = json_decode($result);
+
+if (!isset($data->status) || $data->status != 'okay') {
+ $reason = isset($data->reason) ? $data->reason : get_string('error:connectionunknownreason', 'badges');
+ badges_send_response('failure', $reason);
+}
+
+// Make sure email matches a backpack.
+$check = new stdClass();
+$check->backpackurl = BADGE_BACKPACKURL;
+$check->email = $data->email;
+
+$bp = new OpenBadgesBackpackHandler($check);
+$request = $bp->curl_request('user');
+if (isset($request->status) && $request->status == 'missing') {
+ $reason = get_string('error:backpackemailnotfound', 'badges', $data->email);
+ badges_send_response('failure', $reason);
+} else if (empty($request->userId)) {
+ $reason = get_string('error:backpackdatainvalid', 'badges');
+ badges_send_response('failure', $reason);
+} else {
+ $backpackuid = $request->userId;
+}
+
+// Insert record.
+$obj = new stdClass();
+$obj->userid = $USER->id;
+$obj->email = $data->email;
+$obj->backpackurl = BADGE_BACKPACKURL;
+$obj->backpackuid = $backpackuid;
+$obj->autosync = 0;
+$obj->password = '';
+$DB->insert_record('badge_backpack', $obj);
+
+// Return success indicator and email address.
+badges_send_response('success', $data->email);
+
+
+/**
+ * Return a JSON response containing the response provided.
+ *
+ * @param string $status Status of the response, typically 'success' or 'failure'.
+ * @param string $responsetext On success, the email address of the user,
+ * otherwise a reason for the failure.
+ * @return void Outputs the JSON and terminates the script.
+ */
+function badges_send_response($status, $responsetext) {
+ $out = new stdClass();
+ $out->status = $status;
+ if ($status == 'success') {
+ $out->email = $responsetext;
+ } else {
+ $out->reason = $responsetext;
+ send_header_404();
+ }
+ echo json_encode($out);
+ exit;
+}
diff --git a/badges/criteria.php b/badges/criteria.php
index 7a1e0e4f1ef..20848d294c2 100644
--- a/badges/criteria.php
+++ b/badges/criteria.php
@@ -72,7 +72,7 @@ if ((($update == BADGE_CRITERIA_AGGREGATION_ALL) || ($update == BADGE_CRITERIA_A
$obj->id = $badge->criteria[BADGE_CRITERIA_TYPE_OVERALL]->id;
$obj->method = $update;
if ($DB->update_record('badge_criteria', $obj)) {
- $msg = get_string('changessaved');
+ $msg = 'criteriaupdated';
} else {
$emsg = get_string('error:save', 'badges');
}
@@ -84,7 +84,7 @@ echo $OUTPUT->heading(print_badge_image($badge, $context, 'small') . ' ' . $badg
if ($emsg !== '') {
echo $OUTPUT->notification($emsg);
} else if ($msg !== '') {
- echo $OUTPUT->notification($msg, 'notifysuccess');
+ echo $OUTPUT->notification(get_string($msg, 'badges'), 'notifysuccess');
}
echo $output->print_badge_status_box($badge);
diff --git a/badges/criteria_action.php b/badges/criteria_action.php
index 74ff62c01c1..51b3e89780e 100644
--- a/badges/criteria_action.php
+++ b/badges/criteria_action.php
@@ -80,6 +80,7 @@ if ($delete && has_capability('moodle/badges:configurecriteria', $context)) {
} else {
$badge->criteria[$type]->delete();
}
+ $return->param('msg', 'criteriadeleted');
redirect($return);
}
diff --git a/badges/criteria_settings.php b/badges/criteria_settings.php
index 486febda0e0..6f52fa050a6 100644
--- a/badges/criteria_settings.php
+++ b/badges/criteria_settings.php
@@ -71,8 +71,10 @@ $PAGE->navbar->add($badge->name, new moodle_url('overview.php', array('id' => $b
$cparams = array('criteriatype' => $type, 'badgeid' => $badge->id);
if ($edit) {
$criteria = $badge->criteria[$type];
+ $msg = 'criteriaupdated';
} else {
$criteria = award_criteria::build($cparams);
+ $msg = 'criteriacreated';
}
$mform = new edit_criteria_form($FULLME, array('criteria' => $criteria, 'addcourse' => $addcourse, 'course' => $badge->courseid));
@@ -96,7 +98,7 @@ if (!empty($addcourse)) {
$criteria_overall->save(array('agg' => BADGE_CRITERIA_AGGREGATION_ALL));
}
$criteria->save($data);
- $return->param('msg', get_string('changessaved'));
+ $return->param('msg', $msg);
redirect($return);
}
diff --git a/badges/index.php b/badges/index.php
index 6b00bd2df35..a0d2f17f310 100644
--- a/badges/index.php
+++ b/badges/index.php
@@ -124,33 +124,15 @@ if ($delete && has_capability('moodle/badges:deletebadge', $PAGE->context)) {
}
}
-if ($activate && has_capability('moodle/badges:configuredetails', $PAGE->context)) {
- $badge = new badge($activate);
-
- if (!$badge->has_criteria()) {
- $err = get_string('error:cannotact', 'badges') . get_string('nocriteria', 'badges');
- } else {
- if ($badge->is_locked()) {
- $badge->set_status(BADGE_STATUS_ACTIVE_LOCKED);
- $msg = get_string('activatesuccess', 'badges');
- } else {
- require_sesskey();
- $badge->set_status(BADGE_STATUS_ACTIVE);
- $msg = get_string('activatesuccess', 'badges');
- }
- $returnurl->param('msg', $msg);
- redirect($returnurl);
- }
-} else if ($deactivate && has_capability('moodle/badges:configuredetails', $PAGE->context)) {
+if ($deactivate && has_capability('moodle/badges:configuredetails', $PAGE->context)) {
+ require_sesskey();
$badge = new badge($deactivate);
if ($badge->is_locked()) {
$badge->set_status(BADGE_STATUS_INACTIVE_LOCKED);
- $msg = get_string('deactivatesuccess', 'badges');
} else {
- require_sesskey();
$badge->set_status(BADGE_STATUS_INACTIVE);
- $msg = get_string('deactivatesuccess', 'badges');
}
+ $msg = 'deactivatesuccess';
$returnurl->param('msg', $msg);
redirect($returnurl);
}
@@ -178,7 +160,7 @@ if ($totalcount) {
}
if ($msg !== '') {
- echo $OUTPUT->notification($msg, 'notifysuccess');
+ echo $OUTPUT->notification(get_string($msg, 'badges'), 'notifysuccess');
}
$badges = new badge_management($records);
diff --git a/badges/lib/backpacklib.php b/badges/lib/backpacklib.php
index 4ecf084257e..6e6b3da55f0 100644
--- a/badges/lib/backpacklib.php
+++ b/badges/lib/backpacklib.php
@@ -26,6 +26,12 @@
defined('MOODLE_INTERNAL') || die();
+/*
+ * URL of backpack. Currently only the Open Badges backpack
+ * is supported.
+ */
+define('BADGE_BACKPACKURL', 'http://backpack.openbadges.org');
+
global $CFG;
require_once($CFG->libdir . '/filelib.php');
diff --git a/badges/recipients.php b/badges/recipients.php
index 539696b6ea7..4eac9545623 100644
--- a/badges/recipients.php
+++ b/badges/recipients.php
@@ -31,7 +31,6 @@ $badgeid = required_param('id', PARAM_INT);
$sortby = optional_param('sort', 'dateissued', PARAM_ALPHA);
$sorthow = optional_param('dir', 'DESC', PARAM_ALPHA);
$page = optional_param('page', 0, PARAM_INT);
-$updatepref = optional_param('updatepref', false, PARAM_BOOL);
require_login();
diff --git a/badges/renderer.php b/badges/renderer.php
index 3075dc1f97b..de4894e6d7d 100644
--- a/badges/renderer.php
+++ b/badges/renderer.php
@@ -228,12 +228,16 @@ class core_badges_renderer extends plugin_renderer_base {
public function print_badge_table_actions($badge, $context) {
$actions = "";
- if (has_capability('moodle/badges:configuredetails', $context)) {
+ if (has_capability('moodle/badges:configuredetails', $context) && $badge->has_criteria()) {
// Activate/deactivate badge.
if ($badge->status == BADGE_STATUS_INACTIVE || $badge->status == BADGE_STATUS_INACTIVE_LOCKED) {
- $url = new moodle_url(qualified_me());
- $url->param('activate', $badge->id);
+ // "Activate" will go to another page and ask for confirmation.
+ $url = new moodle_url('/badges/action.php');
+ $url->param('id', $badge->id);
+ $url->param('activate', true);
$url->param('sesskey', sesskey());
+ $return = new moodle_url(qualified_me());
+ $url->param('return', $return->out_as_local_url(false));
$actions .= $this->output->action_icon($url, new pix_icon('t/show', get_string('activate', 'badges'))) . " ";
} else {
$url = new moodle_url(qualified_me());
diff --git a/blocks/html/lib.php b/blocks/html/lib.php
index 58de649618a..98906612d45 100644
--- a/blocks/html/lib.php
+++ b/blocks/html/lib.php
@@ -81,7 +81,7 @@ function block_html_pluginfile($course, $birecord_or_cm, $context, $filearea, $a
$forcedownload = true;
}
- session_get_instance()->write_close();
+ \core\session\manager::write_close();
send_stored_file($file, 60*60, 0, $forcedownload, $options);
}
diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index 2021fefe151..e776a4565d8 100644
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -25,7 +25,7 @@ class block_mnet_hosts extends block_list {
return false;
}
- if (session_is_loggedinas()) {
+ if (\core\session\manager::is_loggedinas()) {
$this->content = new stdClass();
$this->content->footer = html_writer::tag('span',
get_string('notpermittedtojumpas', 'mnet'));
diff --git a/blocks/upgrade.txt b/blocks/upgrade.txt
index 23518050e13..1a9ad4863dc 100644
--- a/blocks/upgrade.txt
+++ b/blocks/upgrade.txt
@@ -1,6 +1,10 @@
This files describes API changes in /blocks/* - activity modules,
information provided here is intended especially for developers.
+=== 2.6 ===
+
+* Deprecated /admin/block.php was removed, make sure blocks are using settings.php instead.
+
=== 2.4 ===
Created new capability 'blocks/xxx:myaddinstance' that determines whether a user can add
diff --git a/cache/README.md b/cache/README.md
index c1f67c2510f..7e9cd59a88b 100644
--- a/cache/README.md
+++ b/cache/README.md
@@ -24,8 +24,8 @@ A definition:
'overrideclassfile' => null, // Optional
'datasource' => null, // Optional
'datasourcefile' => null, // Optional
- 'persistent' => false, // Optional
- 'persistentmaxsize' => false, // Optional
+ 'staticacceleration' => false, // Optional
+ 'staticaccelerationsize' => false, // Optional
'ttl' => 0, // Optional
'mappingsonly' => false // Optional
'invalidationevents' => array( // Optional
@@ -144,8 +144,8 @@ The following optional settings can also be defined:
* overrideclassfile - Included if required when using the overrideclass param.
* datasource - If provided this class will be used as a data source for the definition. It must implement the cache_data_source interface.
* datasourcefile - Included if required when using the datasource param.
-* persistent - If set to true the loader will be stored when first created and provided to subsequent requests. More on this later.
-* persistentmaxsize - If set to an int this will be the maximum number of items stored in the persistent cache.
+* staticacceleration - Any data passing through the cache will be held onto to make subsequent requests for it faster.
+* staticaccelerationsize - If set to an int this will be the maximum number of items stored in the static acceleration array.
* ttl - Can be used to set a ttl value for data being set for this cache.
* mappingsonly - This definition can only be used if there is a store mapping for it. More on this later.
* invalidationevents - An array of events that should trigger this cache to invalidate.
@@ -154,11 +154,10 @@ The following optional settings can also be defined:
It's important to note that internally the definition is also aware of the component. This is picked up when the definition is read, based upon the location of the caches.php file.
-The persistent option.
-As noted the persistent option causes the loader generated for this definition to be stored when first created. Subsequent requests for this definition will be given the original loader instance.
+The staticacceleration option.
Data passed to or retrieved from the loader and its chained loaders gets cached by the instance.
-This option should be used when you know you will require the loader several times and perhaps in different areas of code.
Because it caches key=>value data it avoids the need to re-fetch things from stores after the first request. Its good for performance, bad for memory.
+Memory use can be controlled by setting the staticaccelerationsize option.
It should be used sparingly.
The mappingsonly option.
diff --git a/cache/classes/definition.php b/cache/classes/definition.php
index da5cd4cc209..302bc178070 100644
--- a/cache/classes/definition.php
+++ b/cache/classes/definition.php
@@ -75,19 +75,14 @@ defined('MOODLE_INTERNAL') || die();
* [string] A class to use as the data loader for this definition.
* Any class used here must inherit the cache_data_loader interface.
* + datasourcefile
- * [string] Suplements the above setting indicated the file containing the class to be used. This file is included when
+ * [string] Supplements the above setting indicating the file containing the class to be used. This file is included when
* required.
- * + persistent
- * [bool] This setting does two important things. First it tells the cache API to only instantiate the cache structure for
- * this definition once, further requests will be given the original instance.
- * Second the cache loader will keep an array of the items set and retrieved to the cache during the request.
- * This has several advantages including better performance without needing to start passing the cache instance between
- * function calls, the downside is that the cache instance + the items used stay within memory.
- * Consider using this setting when you know that there are going to be many calls to the cache for the same information
- * or when you are converting existing code to the cache and need to access the cache within functions but don't want
- * to add it as an argument to the function.
- * + persistentmaxsize
- * [int] This supplements the above setting by limiting the number of items in the caches persistent array of items.
+ * + staticacceleration
+ * The cache loader will keep an array of the items set and retrieved to the cache during the request.
+ * Consider using this setting when you know that there are going to be many calls to the cache for the same information.
+ * Requests for data in this array will be ultra fast, but it will cost memory.
+ * + staticaccelerationsize
+ * [int] This supplements the above setting by limiting the number of items in the static acceleration array.
* Tweaking this setting lower will allow you to minimise the memory implications above while hopefully still managing to
* offset calls to the cache store.
* + ttl
@@ -253,16 +248,16 @@ class cache_definition {
protected $datasourceaggregate = null;
/**
- * Set to true if the definitions cache should be persistent
+ * Set to true if the cache should hold onto items passing through it to speed up subsequent requests.
* @var bool
*/
- protected $persistent = false;
+ protected $staticacceleration = false;
/**
- * The persistent item array max size.
+ * The maximum number of items that static acceleration cache should hold onto.
* @var int
*/
- protected $persistentmaxsize = false;
+ protected $staticaccelerationsize = false;
/**
* The TTL for data in this cache. Please don't use this, instead use event driven invalidation.
@@ -363,8 +358,8 @@ class cache_definition {
$overrideclassfile = null;
$datasource = null;
$datasourcefile = null;
- $persistent = false;
- $persistentmaxsize = false;
+ $staticacceleration = false;
+ $staticaccelerationsize = false;
$ttl = 0;
$mappingsonly = false;
$invalidationevents = array();
@@ -419,10 +414,18 @@ class cache_definition {
}
if (array_key_exists('persistent', $definition)) {
- $persistent = (bool)$definition['persistent'];
+ // Ahhh this is the legacy persistent option.
+ $staticacceleration = (bool)$definition['persistent'];
+ }
+ if (array_key_exists('staticacceleration', $definition)) {
+ $staticacceleration = (bool)$definition['staticacceleration'];
}
if (array_key_exists('persistentmaxsize', $definition)) {
- $persistentmaxsize = (int)$definition['persistentmaxsize'];
+ // Ahhh this is the legacy persistentmaxsize option.
+ $staticaccelerationsize = (int)$definition['persistentmaxsize'];
+ }
+ if (array_key_exists('staticaccelerationsize', $definition)) {
+ $staticaccelerationsize = (int)$definition['staticaccelerationsize'];
}
if (array_key_exists('ttl', $definition)) {
$ttl = (int)$definition['ttl'];
@@ -518,8 +521,8 @@ class cache_definition {
$cachedefinition->datasource = $datasource;
$cachedefinition->datasourcefile = $datasourcefile;
$cachedefinition->datasourceaggregate = $datasourceaggregate;
- $cachedefinition->persistent = $persistent;
- $cachedefinition->persistentmaxsize = $persistentmaxsize;
+ $cachedefinition->staticacceleration = $staticacceleration;
+ $cachedefinition->staticaccelerationsize = $staticaccelerationsize;
$cachedefinition->ttl = $ttl;
$cachedefinition->mappingsonly = $mappingsonly;
$cachedefinition->invalidationevents = $invalidationevents;
@@ -543,7 +546,8 @@ class cache_definition {
* - simplekeys : Set to true if the keys you will use are a-zA-Z0-9_
* - simpledata : Set to true if the type of the data you are going to store is scalar, or an array of scalar vars
* - overrideclass : The class to use as the loader.
- * - persistent : If set to true the cache will persist construction requests.
+ * - staticacceleration : If set to true the cache will hold onto data passing through it.
+ * - staticaccelerationsize : Set it to an int to limit the size of the staticacceleration cache.
* @return cache_application|cache_session|cache_request
*/
public static function load_adhoc($mode, $component, $area, array $options = array()) {
@@ -560,7 +564,14 @@ class cache_definition {
$definition['simpledata'] = $options['simpledata'];
}
if (!empty($options['persistent'])) {
- $definition['persistent'] = $options['persistent'];
+ // Ahhh this is the legacy persistent option.
+ $definition['staticacceleration'] = (bool)$options['persistent'];
+ }
+ if (!empty($options['staticacceleration'])) {
+ $definition['staticacceleration'] = (bool)$options['staticacceleration'];
+ }
+ if (!empty($options['staticaccelerationsize'])) {
+ $definition['staticaccelerationsize'] = (int)$options['staticaccelerationsize'];
}
if (!empty($options['overrideclass'])) {
$definition['overrideclass'] = $options['overrideclass'];
@@ -788,18 +799,54 @@ class cache_definition {
/**
* Returns true if this definitions cache should be made persistent.
+ *
+ * Please call {@link cache_definition::use_static_acceleration()} instead.
+ *
+ * @see cache_definition::use_static_acceleration()
+ * @deprecated since 2.6
* @return bool
*/
public function should_be_persistent() {
- return $this->persistent || $this->mode === cache_store::MODE_SESSION;
+ debugging('Please upgrade your code to use cache_definition::use_static_acceleration', DEBUG_DEVELOPER);
+ return $this->use_static_acceleration();
}
/**
- * Returns the max size for the persistent item array in the cache.
+ * Returns true if we should hold onto the data flowing through the cache.
+ *
+ * If set to true data flowing through the cache will be stored in a static variable
+ * to make subsequent requests for the data much faster.
+ *
+ * @return bool
+ */
+ public function use_static_acceleration() {
+ if ($this->mode === cache_store::MODE_REQUEST) {
+ // Request caches should never use static acceleration - it just doesn't make sense.
+ return false;
+ }
+ return $this->staticacceleration || $this->mode === cache_store::MODE_SESSION;
+ }
+
+ /**
+ * Returns the max size for the static acceleration array.
+ *
+ * Please call {@link cache_definition::get_static_acceleration_size()} instead.
+ *
+ * @see cache_definition::get_static_acceleration_size()
+ * @deprecated since 2.6
* @return int
*/
public function get_persistent_max_size() {
- return $this->persistentmaxsize;
+ debugging('Please upgrade your code to call cache_definition::get_static_acceleration_size', DEBUG_DEVELOPER);
+ return $this->get_static_acceleration_size();
+ }
+
+ /**
+ * Returns the max size for the static acceleration array.
+ * @return int
+ */
+ public function get_static_acceleration_size() {
+ return $this->staticaccelerationsize;
}
/**
@@ -916,4 +963,4 @@ class cache_definition {
public function has_required_identifiers() {
return (count($this->requireidentifiers) > 0);
}
-}
\ No newline at end of file
+}
diff --git a/cache/classes/dummystore.php b/cache/classes/dummystore.php
index 43d922961c5..13c3017bd24 100644
--- a/cache/classes/dummystore.php
+++ b/cache/classes/dummystore.php
@@ -46,14 +46,15 @@ class cachestore_dummy extends cache_store {
protected $name;
/**
- * Gets set to true if this store is going to persist data.
- * This happens when the definition doesn't require it as the loader will not be persisting information and something has to.
+ * Gets set to true if this store is going to store data.
+ * This happens when the definition doesn't require static acceleration as the loader will not be storing information and
+ * something has to.
* @var bool
*/
protected $persist = false;
/**
- * The persistent store array
+ * The stored data array
* @var array
*/
protected $store = array();
@@ -106,13 +107,13 @@ class cachestore_dummy extends cache_store {
* @param cache_definition $definition
*/
public function initialise(cache_definition $definition) {
- // If the definition isn't persistent then we need to be persistent here.
+ // If the definition isn't using static acceleration then we need to be store data here.
// The reasoning behind this is that:
- // - If the definition is persistent then the cache loader is going to
- // store things in its persistent cache.
- // - If the definition is not persistent then the cache loader won't try to store anything
+ // - If the definition is using static acceleration then the cache loader is going to
+ // store things in its static array.
+ // - If the definition is not using static acceleration then the cache loader won't try to store anything
// and we will need to store it here in order to make sure it is accessible.
- $this->persist = !$definition->should_be_persistent();
+ $this->persist = !$definition->use_static_acceleration();
}
/**
diff --git a/cache/classes/factory.php b/cache/classes/factory.php
index 476ec0ba55b..2843daed731 100644
--- a/cache/classes/factory.php
+++ b/cache/classes/factory.php
@@ -150,9 +150,7 @@ class cache_factory {
*/
public static function reset() {
$factory = self::instance();
- $factory->cachesfromdefinitions = array();
- $factory->cachesfromparams = array();
- $factory->stores = array();
+ $factory->reset_cache_instances();
$factory->configs = array();
$factory->definitions = array();
$factory->lockplugins = array(); // MUST be null in order to force its regeneration.
@@ -160,6 +158,18 @@ class cache_factory {
$factory->state = self::STATE_UNINITIALISED;
}
+ /**
+ * Resets the stores, clearing the array of created stores.
+ *
+ * Cache objects still held onto by the code that initialised them will remain as is
+ * however all future requests for a cache/store will lead to a new instance being re-initialised.
+ */
+ public function reset_cache_instances() {
+ $this->cachesfromdefinitions = array();
+ $this->cachesfromparams = array();
+ $this->stores = array();
+ }
+
/**
* Creates a cache object given the parameters for a definition.
*
@@ -181,9 +191,8 @@ class cache_factory {
$definition = $this->create_definition($component, $area, $aggregate);
$definition->set_identifiers($identifiers);
$cache = $this->create_cache($definition, $identifiers);
- if ($definition->should_be_persistent()) {
- $this->cachesfromdefinitions[$definitionname] = $cache;
- }
+ // Loaders are always held onto to speed up subsequent requests.
+ $this->cachesfromdefinitions[$definitionname] = $cache;
return $cache;
}
@@ -199,7 +208,8 @@ class cache_factory {
* @param array $options An array of options, available options are:
* - simplekeys : Set to true if the keys you will use are a-zA-Z0-9_
* - simpledata : Set to true if the type of the data you are going to store is scalar, or an array of scalar vars
- * - persistent : If set to true the cache will persist construction requests.
+ * - staticacceleration : If set to true the cache will hold onto data passing through it.
+ * - staticaccelerationsize : The maximum number of items to hold onto for acceleration purposes.
* @return cache_application|cache_session|cache_request
*/
public function create_cache_from_params($mode, $component, $area, array $identifiers = array(), array $options = array()) {
@@ -210,9 +220,7 @@ class cache_factory {
$definition = cache_definition::load_adhoc($mode, $component, $area, $options);
$definition->set_identifiers($identifiers);
$cache = $this->create_cache($definition, $identifiers);
- if ($definition->should_be_persistent()) {
- $this->cachesfromparams[$key] = $cache;
- }
+ $this->cachesfromparams[$key] = $cache;
return $cache;
}
@@ -297,6 +305,15 @@ class cache_factory {
return $this->definitionstores[$id];
}
+ /**
+ * Returns the cache instances that have been used within this request.
+ * @since 2.6
+ * @return array
+ */
+ public function get_caches_in_use() {
+ return $this->cachesfromdefinitions;
+ }
+
/**
* Creates a cache config instance with the ability to write if required.
*
@@ -585,7 +602,9 @@ class cache_factory {
*
*/
public static function disable_stores() {
+ // First reset to clear any static acceleration array.
$factory = self::instance();
+ $factory->reset_cache_instances();
$factory->set_state(self::STATE_STORES_DISABLED);
}
}
diff --git a/cache/classes/helper.php b/cache/classes/helper.php
index 6f30b4b2bf9..96c66019a2a 100644
--- a/cache/classes/helper.php
+++ b/cache/classes/helper.php
@@ -238,19 +238,24 @@ class cache_helper {
$instance = cache_config::instance();
$invalidationeventset = false;
$factory = cache_factory::instance();
+ $inuse = $factory->get_caches_in_use();
foreach ($instance->get_definitions() as $name => $definitionarr) {
$definition = cache_definition::load($name, $definitionarr);
if ($definition->invalidates_on_event($event)) {
- // OK at this point we know that the definition has information to invalidate on the event.
- // There are two routes, either its an application cache in which case we can invalidate it now.
- // or it is a persistent cache that also needs to be invalidated now.
- if ($definition->get_mode() === cache_store::MODE_APPLICATION || $definition->should_be_persistent()) {
- $cache = $factory->create_cache_from_definition($definition->get_component(), $definition->get_area());
- $cache->delete_many($keys);
+ // First up check if there is a cache loader for this definition already.
+ // If there is we need to invalidate the keys from there.
+ $definitionkey = $definition->get_component().'/'.$definition->get_area();
+ if (isset($inuse[$definitionkey])) {
+ $inuse[$definitionkey]->delete_many($keys);
}
- // We need to flag the event in the "Event invalidation" cache if it hasn't already happened.
- if ($invalidationeventset === false) {
+ // We should only log events for application and session caches.
+ // Request caches shouldn't have events as all data is lost at the end of the request.
+ // Events should only be logged once of course and likely several definitions are watching so we
+ // track its logging with $invalidationeventset.
+ $logevent = ($invalidationeventset === false && $definition->get_mode() !== cache_store::MODE_REQUEST);
+
+ if ($logevent) {
// Get the event invalidation cache.
$cache = cache::make('core', 'eventinvalidation');
// Get any existing invalidated keys for this cache.
@@ -312,23 +317,25 @@ class cache_helper {
$instance = cache_config::instance();
$invalidationeventset = false;
$factory = cache_factory::instance();
+ $inuse = $factory->get_caches_in_use();
foreach ($instance->get_definitions() as $name => $definitionarr) {
$definition = cache_definition::load($name, $definitionarr);
if ($definition->invalidates_on_event($event)) {
- // Check if this definition would result in a persistent loader being in use.
- if ($definition->should_be_persistent()) {
- // There may be a persistent cache loader. Lets purge that first so that any persistent data is removed.
- $cache = $factory->create_cache_from_definition($definition->get_component(), $definition->get_area());
- $cache->purge();
- }
- // Get all of the store instances that are in use for this store.
- $stores = $factory->get_store_instances_in_use($definition);
- foreach ($stores as $store) {
- // Purge each store individually.
- $store->purge();
+ // First up check if there is a cache loader for this definition already.
+ // If there is we need to invalidate the keys from there.
+ $definitionkey = $definition->get_component().'/'.$definition->get_area();
+ if (isset($inuse[$definitionkey])) {
+ $inuse[$definitionkey]->purge();
}
+
+ // We should only log events for application and session caches.
+ // Request caches shouldn't have events as all data is lost at the end of the request.
+ // Events should only be logged once of course and likely several definitions are watching so we
+ // track its logging with $invalidationeventset.
+ $logevent = ($invalidationeventset === false && $definition->get_mode() !== cache_store::MODE_REQUEST);
+
// We need to flag the event in the "Event invalidation" cache if it hasn't already happened.
- if ($invalidationeventset === false) {
+ if ($logevent && $invalidationeventset === false) {
// Get the event invalidation cache.
$cache = cache::make('core', 'eventinvalidation');
// Create a key to invalidate all.
diff --git a/cache/classes/loaders.php b/cache/classes/loaders.php
index 6de94e299b3..10ad62095cc 100644
--- a/cache/classes/loaders.php
+++ b/cache/classes/loaders.php
@@ -93,43 +93,46 @@ class cache implements cache_loader {
private $supportsnativettl = null;
/**
- * Gets set to true if the cache is going to be using the build in static "persist" cache.
- * The persist cache statically caches items used during the lifetime of the request. This greatly speeds up interaction
+ * Gets set to true if the cache is going to be using a static array for acceleration.
+ * The array statically caches items used during the lifetime of the request. This greatly speeds up interaction
* with the cache in areas where it will be repetitively hit for the same information such as with strings.
- * There are several other variables to control how this persist cache works.
+ * There are several other variables to control how this static acceleration array works.
* @var bool
*/
- private $persist = false;
+ private $staticacceleration = false;
/**
- * The persist cache itself.
+ * The static acceleration array.
* Items will be stored in this cache as they were provided. This ensure there is no unnecessary processing taking place.
* @var array
*/
- private $persistcache = array();
+ private $staticaccelerationarray = array();
/**
- * The number of items in the persist cache. Avoids count calls like you wouldn't believe.
+ * The number of items in the static acceleration array. Avoids count calls like you wouldn't believe.
* @var int
*/
- private $persistcount = 0;
+ private $staticaccelerationcount = 0;
/**
- * An array containing just the keys being used in the persist cache.
- * This seems redundant perhaps but is used when managing the size of the persist cache.
+ * An array containing just the keys being used in the static acceleration array.
+ * This seems redundant perhaps but is used when managing the size of the static acceleration array.
* Items are added to the end of the array and the when we need to reduce the size of the cache we use the
* key that is first on this array.
* @var array
*/
- private $persistkeys = array();
+ private $staticaccelerationkeys = array();
/**
- * The maximum size of the persist cache. If set to false there is no max size.
- * Caches that make use of the persist cache should seriously consider setting this to something reasonably small, but
+ * The maximum size of the static acceleration array.
+ *
+ * If set to false there is no max size.
+ * Caches that make use of static acceleration should seriously consider setting this to something reasonably small, but
* still large enough to offset repetitive calls.
+ *
* @var int|false
*/
- private $persistmaxsize = false;
+ private $staticaccelerationsize = false;
/**
* Gets set to true during initialisation if the definition is making use of a ttl.
@@ -181,7 +184,8 @@ class cache implements cache_loader {
* @param array $options An array of options, available options are:
* - simplekeys : Set to true if the keys you will use are a-zA-Z0-9_
* - simpledata : Set to true if the type of the data you are going to store is scalar, or an array of scalar vars
- * - persistent : If set to true the cache will persist construction requests.
+ * - staticacceleration : If set to true the cache will hold onto data passing through it.
+ * - staticaccelerationsize : The max size for the static acceleration array.
* @return cache_application|cache_session|cache_store
*/
public static function make_from_params($mode, $component, $area, array $identifiers = array(), array $options = array()) {
@@ -218,9 +222,9 @@ class cache implements cache_loader {
$this->datasource = $loader;
}
$this->definition->generate_definition_hash();
- $this->persist = $this->definition->should_be_persistent();
- if ($this->persist) {
- $this->persistmaxsize = $this->definition->get_persistent_max_size();
+ $this->staticacceleration = $this->definition->use_static_acceleration();
+ if ($this->staticacceleration) {
+ $this->staticaccelerationsize = $this->definition->get_static_acceleration_size();
}
$this->hasattl = ($this->definition->get_ttl() > 0);
}
@@ -228,7 +232,7 @@ class cache implements cache_loader {
/**
* Used to inform the loader of its state as a sub loader, or as the top of the chain.
*
- * This is important as it ensures that we do not have more than one loader keeping persistent data.
+ * This is important as it ensures that we do not have more than one loader keeping static acceleration data.
* Subloaders need to be "pure" loaders in the sense that they are used to store and retrieve information from stores or the
* next loader/data source in the chain.
* Nothing fancy, nothing flash.
@@ -238,14 +242,14 @@ class cache implements cache_loader {
protected function set_is_sub_loader($setting = true) {
if ($setting) {
$this->subloader = true;
- // Subloaders should not keep persistent data.
- $this->persist = false;
- $this->persistmaxsize = false;
+ // Subloaders should not keep static acceleration data.
+ $this->staticacceleration = false;
+ $this->staticaccelerationsize = false;
} else {
$this->subloader = true;
- $this->persist = $this->definition->should_be_persistent();
- if ($this->persist) {
- $this->persistmaxsize = $this->definition->get_persistent_max_size();
+ $this->staticacceleration = $this->definition->use_static_acceleration();
+ if ($this->staticacceleration) {
+ $this->staticaccelerationsize = $this->definition->get_static_acceleration_size();
}
}
}
@@ -276,10 +280,10 @@ class cache implements cache_loader {
public function get($key, $strictness = IGNORE_MISSING) {
// 1. Parse the key.
$parsedkey = $this->parse_key($key);
- // 2. Get it from the persist cache if we can (only when persist is enabled and it has already been requested/set).
+ // 2. Get it from the static acceleration array if we can (only when it is enabled and it has already been requested/set).
$result = false;
- if ($this->is_using_persist_cache()) {
- $result = $this->get_from_persist_cache($parsedkey);
+ if ($this->use_static_acceleration()) {
+ $result = $this->static_acceleration_get($parsedkey);
}
if ($result !== false) {
if (!is_scalar($result)) {
@@ -291,7 +295,7 @@ class cache implements cache_loader {
}
return $result;
}
- // 3. Get it from the store. Obviously wasn't in the persist cache.
+ // 3. Get it from the store. Obviously wasn't in the static acceleration array.
$result = $this->store->get($parsedkey);
if ($result !== false) {
if ($result instanceof cache_ttl_wrapper) {
@@ -305,8 +309,8 @@ class cache implements cache_loader {
if ($result instanceof cache_cached_object) {
$result = $result->restore_object();
}
- if ($this->is_using_persist_cache()) {
- $this->set_in_persist_cache($parsedkey, $result);
+ if ($this->use_static_acceleration()) {
+ $this->static_acceleration_set($parsedkey, $result);
}
}
// 4. Load if from the loader/datasource if we don't already have it.
@@ -374,14 +378,14 @@ class cache implements cache_loader {
$keystofind = array();
// First up check the persist cache for each key.
- $isusingpersist = $this->is_using_persist_cache();
+ $isusingpersist = $this->use_static_acceleration();
foreach ($keys as $key) {
$pkey = $this->parse_key($key);
$keysparsed[$key] = $pkey;
$parsedkeys[$pkey] = $key;
$keystofind[$pkey] = $key;
if ($isusingpersist) {
- $value = $this->get_from_persist_cache($pkey);
+ $value = $this->static_acceleration_get($pkey);
if ($value !== false) {
$resultpersist[$pkey] = $value;
unset($keystofind[$pkey]);
@@ -404,6 +408,9 @@ class cache implements cache_loader {
if ($value instanceof cache_cached_object) {
$value = $value->restore_object();
}
+ if ($value !== false && $this->use_static_acceleration()) {
+ $this->static_acceleration_set($key, $value);
+ }
$resultstore[$key] = $value;
}
}
@@ -499,8 +506,8 @@ class cache implements cache_loader {
$data = new cache_ttl_wrapper($data, $this->definition->get_ttl());
}
$parsedkey = $this->parse_key($key);
- if ($this->is_using_persist_cache()) {
- $this->set_in_persist_cache($parsedkey, $data);
+ if ($this->use_static_acceleration()) {
+ $this->static_acceleration_set($parsedkey, $data);
}
return $this->store->set($parsedkey, $data);
}
@@ -604,7 +611,7 @@ class cache implements cache_loader {
}
$data = array();
$simulatettl = $this->has_a_ttl() && !$this->store_supports_native_ttl();
- $usepersistcache = $this->is_using_persist_cache();
+ $usestaticaccelerationarray = $this->use_static_acceleration();
foreach ($keyvaluearray as $key => $value) {
if (is_object($value) && $value instanceof cacheable_object) {
$value = new cache_cached_object($value);
@@ -622,8 +629,8 @@ class cache implements cache_loader {
'key' => $this->parse_key($key),
'value' => $value
);
- if ($usepersistcache) {
- $this->set_in_persist_cache($data[$key]['key'], $value);
+ if ($usestaticaccelerationarray) {
+ $this->static_acceleration_set($data[$key]['key'], $value);
}
}
if ($this->perfdebug) {
@@ -655,8 +662,8 @@ class cache implements cache_loader {
*/
public function has($key, $tryloadifpossible = false) {
$parsedkey = $this->parse_key($key);
- if ($this->is_in_persist_cache($parsedkey)) {
- // Hoorah, that was easy. It exists in the persist cache so we definitely have it.
+ if ($this->static_acceleration_has($parsedkey)) {
+ // Hoorah, that was easy. It exists in the static acceleration array so we definitely have it.
return true;
}
if ($this->has_a_ttl() && !$this->store_supports_native_ttl()) {
@@ -737,11 +744,11 @@ class cache implements cache_loader {
return false;
}
- if ($this->is_using_persist_cache()) {
+ if ($this->use_static_acceleration()) {
$parsedkeys = array();
foreach ($keys as $id => $key) {
$parsedkey = $this->parse_key($key);
- if ($this->is_in_persist_cache($parsedkey)) {
+ if ($this->static_acceleration_has($parsedkey)) {
return true;
}
$parsedkeys[] = $parsedkey;
@@ -762,7 +769,7 @@ class cache implements cache_loader {
*/
public function delete($key, $recurse = true) {
$parsedkey = $this->parse_key($key);
- $this->delete_from_persist_cache($parsedkey);
+ $this->static_acceleration_delete($parsedkey);
if ($recurse && $this->loader !== false) {
// Delete from the bottom of the stack first.
$this->loader->delete($key, $recurse);
@@ -780,9 +787,9 @@ class cache implements cache_loader {
*/
public function delete_many(array $keys, $recurse = true) {
$parsedkeys = array_map(array($this, 'parse_key'), $keys);
- if ($this->is_using_persist_cache()) {
+ if ($this->use_static_acceleration()) {
foreach ($parsedkeys as $parsedkey) {
- $this->delete_from_persist_cache($parsedkey);
+ $this->static_acceleration_delete($parsedkey);
}
}
if ($recurse && $this->loader !== false) {
@@ -798,8 +805,12 @@ class cache implements cache_loader {
* @return bool True on success, false otherwise
*/
public function purge() {
- // 1. Purge the persist cache.
- $this->persistcache = array();
+ // 1. Purge the static acceleration array.
+ $this->staticaccelerationarray = array();
+ if ($this->staticaccelerationsize !== false) {
+ $this->staticaccelerationkeys = array();
+ $this->staticaccelerationcount = 0;
+ }
// 2. Purge the store.
$this->store->purge();
// 3. Optionally pruge any stacked loaders.
@@ -908,62 +919,101 @@ class cache implements cache_loader {
}
/**
- * Returns true if this cache is making use of the persist cache.
+ * Returns true if this cache is making use of the static acceleration array.
*
+ * @deprecated since 2.6
+ * @see cache::use_static_acceleration()
* @return bool
*/
protected function is_using_persist_cache() {
- return $this->persist;
+ debugging('This function has been deprecated. Please call use_static_acceleration instead', DEBUG_DEVELOPER);
+ return $this->use_static_acceleration();
}
/**
- * Returns true if the requested key exists within the persist cache.
+ * Returns true if this cache is making use of the static acceleration array.
*
+ * @return bool
+ */
+ protected function use_static_acceleration() {
+ return $this->staticacceleration;
+ }
+
+ /**
+ * Returns true if the requested key exists within the static acceleration array.
+ *
+ * @see cache::static_acceleration_has
+ * @deprecated since 2.6
* @param string $key The parsed key
* @return bool
*/
protected function is_in_persist_cache($key) {
+ debugging('This function has been deprecated. Please call static_acceleration_has instead', DEBUG_DEVELOPER);
+ return $this->static_acceleration_has($key);
+ }
+
+ /**
+ * Returns true if the requested key exists within the static acceleration array.
+ *
+ * @param string $key The parsed key
+ * @return bool
+ */
+ protected function static_acceleration_has($key) {
// This method of checking if an array was supplied is faster than is_array.
if ($key === (array)$key) {
$key = $key['key'];
}
// This could be written as a single line, however it has been split because the ttl check is faster than the instanceof
// and has_expired calls.
- if (!$this->persist || !array_key_exists($key, $this->persistcache)) {
+ if (!$this->staticacceleration || !array_key_exists($key, $this->staticaccelerationarray)) {
return false;
}
if ($this->has_a_ttl() && $this->store_supports_native_ttl()) {
- return !($this->persistcache[$key] instanceof cache_ttl_wrapper && $this->persistcache[$key]->has_expired());
+ return !($this->staticaccelerationarray[$key] instanceof cache_ttl_wrapper &&
+ $this->staticaccelerationarray[$key]->has_expired());
}
return true;
}
/**
- * Returns the item from the persist cache if it exists there.
+ * Returns the item from the static acceleration array if it exists there.
*
+ * @deprecated since 2.6
+ * @see cache::static_acceleration_get
* @param string $key The parsed key
- * @return mixed|false The data from the persist cache or false if it wasn't there.
+ * @return mixed|false The data from the static acceleration array or false if it wasn't there.
*/
protected function get_from_persist_cache($key) {
+ debugging('This function has been deprecated. Please call static_acceleration_get instead', DEBUG_DEVELOPER);
+ return $this->static_acceleration_get($key);
+ }
+
+ /**
+ * Returns the item from the static acceleration array if it exists there.
+ *
+ * @param string $key The parsed key
+ * @return mixed|false The data from the static acceleration array or false if it wasn't there.
+ */
+ protected function static_acceleration_get($key) {
// This method of checking if an array was supplied is faster than is_array.
if ($key === (array)$key) {
$key = $key['key'];
}
// This isset check is faster than array_key_exists but will return false
// for null values, meaning null values will come from backing store not
- // the persist cache. We think this okay because null usage should be
+ // the static acceleration array. We think this okay because null usage should be
// very rare (see comment in MDL-39472).
- if (!$this->persist || !isset($this->persistcache[$key])) {
+ if (!$this->staticacceleration || !isset($this->staticaccelerationarray[$key])) {
$result = false;
} else {
- $data = $this->persistcache[$key];
+ $data = $this->staticaccelerationarray[$key];
if (!$this->has_a_ttl() || !$data instanceof cache_ttl_wrapper) {
if ($data instanceof cache_cached_object) {
$data = $data->restore_object();
}
$result = $data;
} else if ($data->has_expired()) {
- $this->delete_from_persist_cache($key);
+ $this->static_acceleration_delete($key);
$result = false;
} else {
if ($data instanceof cache_cached_object) {
@@ -974,64 +1024,95 @@ class cache implements cache_loader {
}
if ($result) {
if ($this->perfdebug) {
- cache_helper::record_cache_hit('** static persist **', $this->definition->get_id());
+ cache_helper::record_cache_hit('** static acceleration **', $this->definition->get_id());
}
- if ($this->persistmaxsize > 1 && $this->persistcount > 1) {
- // Check to see if this is the last item on the persist keys array.
- if (end($this->persistkeys) !== $key) {
+ if ($this->staticaccelerationsize > 1 && $this->staticaccelerationcount > 1) {
+ // Check to see if this is the last item on the static acceleration keys array.
+ if (end($this->staticaccelerationkeys) !== $key) {
// It isn't the last item.
// Move the item to the end of the array so that it is last to be removed.
- unset($this->persistkeys[$key]);
- $this->persistkeys[$key] = $key;
+ unset($this->staticaccelerationkeys[$key]);
+ $this->staticaccelerationkeys[$key] = $key;
}
}
return $result;
} else {
if ($this->perfdebug) {
- cache_helper::record_cache_miss('** static persist **', $this->definition->get_id());
+ cache_helper::record_cache_miss('** static acceleration **', $this->definition->get_id());
}
return false;
}
}
/**
- * Sets a key value pair into the persist cache.
+ * Sets a key value pair into the static acceleration array.
*
+ * @deprecated since 2.6
+ * @see cache::static_acceleration_set
* @param string $key The parsed key
* @param mixed $data
* @return bool
*/
protected function set_in_persist_cache($key, $data) {
+ debugging('This function has been deprecated. Please call static_acceleration_set instead', DEBUG_DEVELOPER);
+ return $this->static_acceleration_set($key, $data);
+ }
+
+ /**
+ * Sets a key value pair into the static acceleration array.
+ *
+ * @param string $key The parsed key
+ * @param mixed $data
+ * @return bool
+ */
+ protected function static_acceleration_set($key, $data) {
// This method of checking if an array was supplied is faster than is_array.
if ($key === (array)$key) {
$key = $key['key'];
}
- $this->persistcache[$key] = $data;
- if ($this->persistmaxsize !== false) {
- $this->persistcount++;
- $this->persistkeys[$key] = $key;
- if ($this->persistcount > $this->persistmaxsize) {
- $dropkey = array_shift($this->persistkeys);
- unset($this->persistcache[$dropkey]);
- $this->persistcount--;
+ if ($this->staticaccelerationsize !== false && isset($this->staticaccelerationkeys[$key])) {
+ $this->staticaccelerationcount--;
+ unset($this->staticaccelerationkeys[$key]);
+ }
+ $this->staticaccelerationarray[$key] = $data;
+ if ($this->staticaccelerationsize !== false) {
+ $this->staticaccelerationcount++;
+ $this->staticaccelerationkeys[$key] = $key;
+ if ($this->staticaccelerationcount > $this->staticaccelerationsize) {
+ $dropkey = array_shift($this->staticaccelerationkeys);
+ unset($this->staticaccelerationarray[$dropkey]);
+ $this->staticaccelerationcount--;
}
}
return true;
}
/**
- * Deletes an item from the persist cache.
+ * Deletes an item from the static acceleration array.
*
+ * @deprecated since 2.6
+ * @see cache::static_acceleration_delete()
* @param string|int $key As given to get|set|delete
* @return bool True on success, false otherwise.
*/
protected function delete_from_persist_cache($key) {
- unset($this->persistcache[$key]);
- if ($this->persistmaxsize !== false) {
- $dropkey = array_search($key, $this->persistkeys);
+ debugging('This function has been deprecated. Please call static_acceleration_delete instead', DEBUG_DEVELOPER);
+ return $this->static_acceleration_delete($key);
+ }
+
+ /**
+ * Deletes an item from the static acceleration array.
+ *
+ * @param string|int $key As given to get|set|delete
+ * @return bool True on success, false otherwise.
+ */
+ protected function static_acceleration_delete($key) {
+ unset($this->staticaccelerationarray[$key]);
+ if ($this->staticaccelerationsize !== false) {
+ $dropkey = array_search($key, $this->staticaccelerationkeys);
if ($dropkey) {
- unset($this->persistkeys[$dropkey]);
- $this->persistcount--;
+ unset($this->staticaccelerationkeys[$dropkey]);
+ $this->staticaccelerationcount--;
}
}
return true;
@@ -1448,9 +1529,8 @@ class cache_application extends cache implements cache_loader_with_locking {
* This class is used for session caches returned by the cache::make methods.
*
* It differs from the application loader in a couple of noteable ways:
- * 1. Sessions are always expected to be persistent.
- * Because of this we don't ever use the persist cache and instead a session array
- * containing all of the data is maintained by this object.
+ * 1. Sessions are always expected to exist.
+ * Because of this we don't ever use the static acceleration array.
* 2. Session data for a loader instance (store + definition) is consolidate into a
* single array for storage within the store.
* Along with this we embed a lastaccessed time with the data. This way we can
@@ -2063,12 +2143,12 @@ class cache_session extends cache {
}
/**
- * The session loader never uses the persist cache.
+ * The session loader never uses static acceleration.
* Instead it stores things in the static $session variable. Shared between all session loaders.
*
* @return bool
*/
- protected function is_using_persist_cache() {
+ protected function use_static_acceleration() {
return false;
}
}
diff --git a/cache/disabledlib.php b/cache/disabledlib.php
index e65b766be6e..26c938b821d 100644
--- a/cache/disabledlib.php
+++ b/cache/disabledlib.php
@@ -49,8 +49,7 @@ class cache_disabled extends cache {
* @param null $loader Unused.
*/
public function __construct(cache_definition $definition, cache_store $store, $loader = null) {
- $this->definition = $definition;
- $this->store = $store;
+ // Nothing to do here.
}
/**
@@ -228,7 +227,8 @@ class cache_factory_disabled extends cache_factory {
* @param array $options An array of options, available options are:
* - simplekeys : Set to true if the keys you will use are a-zA-Z0-9_
* - simpledata : Set to true if the type of the data you are going to store is scalar, or an array of scalar vars
- * - persistent : If set to true the cache will persist construction requests.
+ * - staticacceleration : If set to true the cache will hold onto all data passing through it.
+ * - staticaccelerationsize : Sets the max size of the static acceleration array.
* @return cache_application|cache_session|cache_request
*/
public function create_cache_from_params($mode, $component, $area, array $identifiers = array(), array $options = array()) {
diff --git a/cache/locks/file/version.php b/cache/locks/file/version.php
new file mode 100644
index 00000000000..b7955dab63f
--- /dev/null
+++ b/cache/locks/file/version.php
@@ -0,0 +1,30 @@
+.
+
+/**
+ * File locking for the Cache API
+ *
+ * @package cachelock_file
+ * @category cache
+ * @copyright 2012 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version = 2013091300; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires = 2013091300; // Requires this Moodle version
+$plugin->component = 'cachelock_file'; // Full name of the plugin (used for diagnostics)
diff --git a/cache/tests/cache_test.php b/cache/tests/cache_test.php
index 23df737f0e8..6295f55ee9b 100644
--- a/cache/tests/cache_test.php
+++ b/cache/tests/cache_test.php
@@ -149,8 +149,8 @@ class core_cache_testcase extends advanced_testcase {
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
'area' => 'test_default_application_cache',
- 'persistent' => true,
- 'persistentmaxsize' => 1
+ 'staticacceleration' => true,
+ 'staticaccelerationsize' => 1
));
$cache = cache::make('phpunit', 'test_default_application_cache');
$this->assertInstanceOf('cache_application', $cache);
@@ -189,7 +189,7 @@ class core_cache_testcase extends advanced_testcase {
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
'area' => 'nostoretest2',
- 'persistent' => true
+ 'staticacceleration' => true
));
$instance->phpunit_remove_stores();
@@ -924,11 +924,11 @@ class core_cache_testcase extends advanced_testcase {
'crazyevent'
)
));
- $instance->phpunit_add_definition('phpunit/eventpurgetestpersistent', array(
+ $instance->phpunit_add_definition('phpunit/eventpurgetestaccelerated', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
- 'area' => 'eventpurgetestpersistent',
- 'persistent' => true,
+ 'area' => 'eventpurgetestaccelerated',
+ 'staticacceleration' => true,
'invalidationevents' => array(
'crazyevent'
)
@@ -947,8 +947,8 @@ class core_cache_testcase extends advanced_testcase {
$this->assertFalse($cache->get('testkey1'));
$this->assertFalse($cache->get('testkey2'));
- // Now test the persistent cache.
- $cache = cache::make('phpunit', 'eventpurgetestpersistent');
+ // Now test the static acceleration array.
+ $cache = cache::make('phpunit', 'eventpurgetestaccelerated');
$this->assertTrue($cache->set('testkey1', 'test data 1'));
$this->assertEquals('test data 1', $cache->get('testkey1'));
$this->assertTrue($cache->set('testkey2', 'test data 2'));
@@ -975,11 +975,11 @@ class core_cache_testcase extends advanced_testcase {
'crazyevent'
)
));
- $instance->phpunit_add_definition('phpunit/eventpurgetestpersistent', array(
+ $instance->phpunit_add_definition('phpunit/eventpurgetestaccelerated', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
- 'area' => 'eventpurgetestpersistent',
- 'persistent' => true,
+ 'area' => 'eventpurgetestaccelerated',
+ 'staticacceleration' => true,
'invalidationevents' => array(
'crazyevent'
)
@@ -998,8 +998,8 @@ class core_cache_testcase extends advanced_testcase {
$this->assertFalse($cache->get('testkey1'));
$this->assertFalse($cache->get('testkey2'));
- // Now test the persistent cache.
- $cache = cache::make('phpunit', 'eventpurgetestpersistent');
+ // Now test the static acceleration array.
+ $cache = cache::make('phpunit', 'eventpurgetestaccelerated');
$this->assertTrue($cache->set('testkey1', 'test data 1'));
$this->assertEquals('test data 1', $cache->get('testkey1'));
$this->assertTrue($cache->set('testkey2', 'test data 2'));
@@ -1400,8 +1400,8 @@ class core_cache_testcase extends advanced_testcase {
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
'area' => 'test_application_locking',
- 'persistent' => true,
- 'persistentmaxsize' => 1,
+ 'staticacceleration' => true,
+ 'staticaccelerationsize' => 1,
'requirelockingread' => true,
'requirelockingwrite' => true
));
@@ -1535,4 +1535,162 @@ class core_cache_testcase extends advanced_testcase {
$this->assertInstanceOf('cache_request', $cache);
$this->assertArrayHasKey('cache_is_searchable', $cache->phpunit_get_store_implements());
}
-}
\ No newline at end of file
+
+ public function test_static_acceleration() {
+ $instance = cache_config_phpunittest::instance();
+ $instance->phpunit_add_definition('phpunit/accelerated', array(
+ 'mode' => cache_store::MODE_APPLICATION,
+ 'component' => 'phpunit',
+ 'area' => 'accelerated',
+ 'staticacceleration' => true,
+ 'staticaccelerationsize' => 3,
+ ));
+ $instance->phpunit_add_definition('phpunit/accelerated2', array(
+ 'mode' => cache_store::MODE_APPLICATION,
+ 'component' => 'phpunit',
+ 'area' => 'accelerated2',
+ 'staticacceleration' => true,
+ 'staticaccelerationsize' => 3,
+ ));
+ $instance->phpunit_add_definition('phpunit/accelerated3', array(
+ 'mode' => cache_store::MODE_APPLICATION,
+ 'component' => 'phpunit',
+ 'area' => 'accelerated3',
+ 'staticacceleration' => true,
+ 'staticaccelerationsize' => 3,
+ ));
+ $instance->phpunit_add_definition('phpunit/accelerated4', array(
+ 'mode' => cache_store::MODE_APPLICATION,
+ 'component' => 'phpunit',
+ 'area' => 'accelerated4',
+ 'staticacceleration' => true,
+ 'staticaccelerationsize' => 4,
+ ));
+ $cache = cache::make('phpunit', 'accelerated');
+ $this->assertInstanceOf('cache_phpunit_application', $cache);
+
+ // Set and get three elements.
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('b', 'B'));
+ $this->assertTrue($cache->set('c', 'C'));
+ $this->assertEquals('A', $cache->get('a'));
+ $this->assertEquals(array('b' => 'B', 'c' => 'C'), $cache->get_many(array('b', 'c')));
+
+ // Make sure all items are in static acceleration array.
+ $this->assertEquals('A', $cache->phpunit_static_acceleration_get('a'));
+ $this->assertEquals('B', $cache->phpunit_static_acceleration_get('b'));
+ $this->assertEquals('C', $cache->phpunit_static_acceleration_get('c'));
+
+ // Add new value and make sure it is in cache and it is in array.
+ $this->assertTrue($cache->set('d', 'D'));
+ $this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('D', $cache->get('d'));
+
+ // Now the least recent accessed item (a) is no longer in acceleration array.
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertEquals('B', $cache->phpunit_static_acceleration_get('b'));
+ $this->assertEquals('C', $cache->phpunit_static_acceleration_get('c'));
+
+ // Adding and deleting element.
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->delete('a'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertFalse($cache->has('a'));
+
+ // Make sure "purge" deletes from the array as well.
+ $cache->purge();
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('b'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('c'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('d'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('e'));
+
+ // Check that the array holds the last accessed items by get/set.
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('b', 'B'));
+ $this->assertTrue($cache->set('c', 'C'));
+ $this->assertTrue($cache->set('d', 'D'));
+ $this->assertTrue($cache->set('e', 'E'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('b'));
+ $this->assertEquals('C', $cache->phpunit_static_acceleration_get('c'));
+ $this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+
+ /** @var cache_phpunit_application $cache */
+ $cache = cache::make('phpunit', 'accelerated2');
+ $this->assertInstanceOf('cache_phpunit_application', $cache);
+
+ // Check that the array holds the last accessed items by get/set.
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('b', 'B'));
+ $this->assertTrue($cache->set('c', 'C'));
+ $this->assertTrue($cache->set('d', 'D'));
+ $this->assertTrue($cache->set('e', 'E'));
+ // Current keys in the array: c, d, e.
+ $this->assertEquals('C', $cache->phpunit_static_acceleration_get('c'));
+ $this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('b'));
+
+ $this->assertEquals('A', $cache->get('a'));
+ // Current keys in the array: d, e, a.
+ $this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+ $this->assertEquals('A', $cache->phpunit_static_acceleration_get('a'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('b'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('c'));
+
+ // Current keys in the array: d, e, a.
+ $this->assertEquals(array('c' => 'C'), $cache->get_many(array('c')));
+ // Current keys in the array: e, a, c.
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+ $this->assertEquals('A', $cache->phpunit_static_acceleration_get('a'));
+ $this->assertEquals('C', $cache->phpunit_static_acceleration_get('c'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('b'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('d'));
+
+
+ $cache = cache::make('phpunit', 'accelerated3');
+ $this->assertInstanceOf('cache_phpunit_application', $cache);
+
+ // Check that the array holds the last accessed items by get/set.
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('b', 'B'));
+ $this->assertTrue($cache->set('c', 'C'));
+ $this->assertTrue($cache->set('d', 'D'));
+ $this->assertTrue($cache->set('e', 'E'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('b'));
+ $this->assertEquals('C', $cache->phpunit_static_acceleration_get('c'));
+ $this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+
+ $this->assertTrue($cache->set('b', 'B2'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertEquals('B2', $cache->phpunit_static_acceleration_get('b'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('c'));
+ $this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+
+ $this->assertEquals(2, $cache->set_many(array('b' => 'B3', 'c' => 'C3')));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('a'));
+ $this->assertEquals('B3', $cache->phpunit_static_acceleration_get('b'));
+ $this->assertEquals('C3', $cache->phpunit_static_acceleration_get('c'));
+ $this->assertFalse($cache->phpunit_static_acceleration_get('d'));
+ $this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
+
+ $cache = cache::make('phpunit', 'accelerated4');
+ $this->assertInstanceOf('cache_phpunit_application', $cache);
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertTrue($cache->set('a', 'A'));
+ $this->assertEquals('A', $cache->phpunit_static_acceleration_get('a'));
+ $this->assertEquals('A', $cache->get('a'));
+ }
+}
diff --git a/cache/tests/fixtures/lib.php b/cache/tests/fixtures/lib.php
index b6d73584220..e6ecbe0f407 100644
--- a/cache/tests/fixtures/lib.php
+++ b/cache/tests/fixtures/lib.php
@@ -251,6 +251,17 @@ class cache_phpunit_application extends cache_application {
public function phpunit_get_store_implements() {
return class_implements($this->get_store());
}
+
+ /**
+ * Returns the given key directly from the static acceleration array.
+ *
+ * @param string $key
+ * @return false|mixed
+ */
+ public function phpunit_static_acceleration_get($key) {
+ $key = $this->parse_key($key);
+ return $this->static_acceleration_get($key);
+ }
}
/**
diff --git a/cache/upgrade.txt b/cache/upgrade.txt
index 72ac93bda2e..38f9c4b21bc 100644
--- a/cache/upgrade.txt
+++ b/cache/upgrade.txt
@@ -1,6 +1,20 @@
This files describes API changes in /cache/stores/* - cache store plugins.
Information provided here is intended especially for developers.
+=== 2.6 ===
+* All cache instances are recorded and subsequent requests are given a reference to the original instance.
+* The persistent option for the cache definition has been deprecated. Please use the staticacceleration option instead.
+* There is a new static acceleration option. If enabled data passing through the cache is held onto.
+* The persistentmaxsize option has been renamed to staticaccelerationsize. It does the same thing.
+* cache_definition::should_be_persistent has been deprecated. Please call cache_definition::use_static_acceleration instead.
+* cache_definition::get_persistent_max_size has been deprecated. Please call cache_definition::get_static_acceleration_size instead.
+* cache::is_using_persist_cache() has been deprecated. Please call cache::use_static_acceleration()
+* cache::is_in_persist_cache() has been deprecated. Please call cache::static_acceleration_has()
+* cache::get_from_persist_cache() has been deprecated. Please call cache::static_acceleration_get()
+* cache::set_in_persist_cache() has been deprecated. Please call cache::static_acceleration_set()
+* cache::delete_from_persist_cache() has been deprecated. Please call cache::static_acceleration_delete()
+* If you have any custom cache loaders you will need to rename these methods if you have overriden them and adjust any calls you may have made to them.
+
=== 2.5 ===
* cleanup method renamed to instance_deleted.
It is now called when the store is deleted as all comments suggested anyway.
diff --git a/calendar/tests/calendartype_test.php b/calendar/tests/calendartype_test.php
index 10e72ea254f..9f117992c76 100644
--- a/calendar/tests/calendartype_test.php
+++ b/calendar/tests/calendartype_test.php
@@ -277,6 +277,6 @@ class core_calendar_type_testcase extends advanced_testcase {
*/
private function set_calendar_type($type) {
$this->user->calendartype = $type;
- session_set_user($this->user);
+ \core\session\manager::set_user($this->user);
}
}
diff --git a/config-dist.php b/config-dist.php
index 186516637ae..e57a61dff9c 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -224,10 +224,22 @@ $CFG->admin = 'admin';
// RewriteRule (^.*/theme/yui_combo\.php)(/.*) $1?file=$2
//
//
-// By default all user sessions should be using locking, uncomment
-// the following setting to prevent locking for guests and not-logged-in
-// accounts. This may improve performance significantly.
-// $CFG->sessionlockloggedinonly = 1;
+// Following settings may be used to select session driver, uncomment only one of the handlers.
+// Database session handler (not compatible with MyISAM):
+// $CFG->session_handler_class = '\core\session\database';
+// $CFG->session_database_acquire_lock_timeout = 120;
+//
+// File session handler (file system locking required):
+// $CFG->session_handler_class = '\core\session\file';
+// $CFG->session_file_save_path = $CFG->dataroot.'/sessions';
+//
+// Memcached session handler (requires memcached server and extension):
+// $CFG->session_handler_class = '\core\session\memcached';
+// $CFG->session_memcached_save_path = '127.0.0.1:11211';
+// $CFG->session_memcached_prefix = 'memc.sess.key.';
+//
+// Following setting allows you to alter how frequently is timemodified updated in sessions table.
+// $CFG->session_update_timemodified_frequency = 20; // In seconds.
//
// If this setting is set to true, then Moodle will track the IP of the
// current user to make sure it hasn't changed during a session. This
@@ -628,6 +640,20 @@ $CFG->admin = 'admin';
// used to expand the default white list with an array of extra settings.
// Example:
// $CFG->behat_extraallowedsettings = array('logsql', 'dblogerror');
+//
+//=========================================================================
+// 12. DEVELOPER DATA GENERATOR
+//=========================================================================
+//
+// The developer data generator tool is intended to be used only in development or testing sites and
+// it's usage in production environments is not recommended; if it is used to create JMeter test plans
+// is even less recommended as JMeter needs to log in as site course users. JMeter needs to know the
+// users passwords but would be dangerous to have a default password as everybody would know it, which would
+// be specially dangerouse if somebody uses this tool in a production site, so in order to prevent unintended
+// uses of the tool and undesired accesses as well, is compulsory to set a password for the users
+// generated by this tool, but only in case you want to generate a JMeter test. The value should be a string.
+// Example:
+// $CFG->tool_generator_users_password = 'examplepassword';
//=========================================================================
// ALL DONE! To continue installation, visit your main page with a browser
diff --git a/course/loginas.php b/course/loginas.php
index 97f7d2a81ef..bfc3495eb75 100644
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -11,7 +11,7 @@ $url = new moodle_url('/course/loginas.php', array('id'=>$id));
$PAGE->set_url($url);
// Reset user back to their real self if needed, for security reasons you need to log out and log in again.
-if (session_is_loggedinas()) {
+if (\core\session\manager::is_loggedinas()) {
require_sesskey();
require_logout();
@@ -61,7 +61,7 @@ if (has_capability('moodle/user:loginas', $systemcontext)) {
}
// Login as this user and return to course home page.
-session_loginas($userid, $context);
+\core\session\manager::loginas($userid, $context);
$newfullname = fullname($USER, true);
$strloginas = get_string('loginas');
diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 8a7aa14b6bc..5b489bfe7d4 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -650,12 +650,16 @@ abstract class moodleform_mod extends moodleform {
$mform->addElement('hidden', 'completionunlocked', 0);
$mform->setType('completionunlocked', PARAM_INT);
+ $trackingdefault = COMPLETION_TRACKING_NONE;
+ // If system and activity default is on, set it.
+ if ($CFG->completiondefault && $this->_features->defaultcompletion) {
+ $trackingdefault = COMPLETION_TRACKING_MANUAL;
+ }
+
$mform->addElement('select', 'completion', get_string('completion', 'completion'),
array(COMPLETION_TRACKING_NONE=>get_string('completion_none', 'completion'),
COMPLETION_TRACKING_MANUAL=>get_string('completion_manual', 'completion')));
- $mform->setDefault('completion', $this->_features->defaultcompletion
- ? COMPLETION_TRACKING_MANUAL
- : COMPLETION_TRACKING_NONE);
+ $mform->setDefault('completion', $trackingdefault);
$mform->addHelpButton('completion', 'completion', 'completion');
// Automatic completion once you view it
diff --git a/course/yui/build/moodle-course-util-base/moodle-course-util-base-debug.js b/course/yui/build/moodle-course-util-base/moodle-course-util-base-debug.js
new file mode 100644
index 00000000000..cbeb1ba2e5c
--- /dev/null
+++ b/course/yui/build/moodle-course-util-base/moodle-course-util-base-debug.js
@@ -0,0 +1,21 @@
+YUI.add('moodle-course-util-base', function (Y, NAME) {
+
+/**
+ * The Moodle.core_course.util classes provide course-related utility functions.
+ *
+ * @module moodle-course-util
+ * @main
+ */
+
+Y.namespace('Moodle.core_course.util');
+
+/**
+ * A collection of general utility functions for use in course.
+ *
+ * @class Moodle.core_course.util
+ * @static
+ */
+
+
+
+}, '@VERSION@');
diff --git a/course/yui/build/moodle-course-util-base/moodle-course-util-base-min.js b/course/yui/build/moodle-course-util-base/moodle-course-util-base-min.js
new file mode 100644
index 00000000000..2d1cba0ef65
--- /dev/null
+++ b/course/yui/build/moodle-course-util-base/moodle-course-util-base-min.js
@@ -0,0 +1 @@
+YUI.add("moodle-course-util-base",function(e,t){e.namespace("Moodle.core_course.util")},"@VERSION@");
diff --git a/course/yui/build/moodle-course-util-base/moodle-course-util-base.js b/course/yui/build/moodle-course-util-base/moodle-course-util-base.js
new file mode 100644
index 00000000000..cbeb1ba2e5c
--- /dev/null
+++ b/course/yui/build/moodle-course-util-base/moodle-course-util-base.js
@@ -0,0 +1,21 @@
+YUI.add('moodle-course-util-base', function (Y, NAME) {
+
+/**
+ * The Moodle.core_course.util classes provide course-related utility functions.
+ *
+ * @module moodle-course-util
+ * @main
+ */
+
+Y.namespace('Moodle.core_course.util');
+
+/**
+ * A collection of general utility functions for use in course.
+ *
+ * @class Moodle.core_course.util
+ * @static
+ */
+
+
+
+}, '@VERSION@');
diff --git a/course/yui/build/moodle-course-util-cm/moodle-course-util-cm-debug.js b/course/yui/build/moodle-course-util-cm/moodle-course-util-cm-debug.js
new file mode 100644
index 00000000000..aef40c5055a
--- /dev/null
+++ b/course/yui/build/moodle-course-util-cm/moodle-course-util-cm-debug.js
@@ -0,0 +1,75 @@
+YUI.add('moodle-course-util-cm', function (Y, NAME) {
+
+/**
+ * A collection of utility classes for use with course modules.
+ *
+ * @module moodle-course-util
+ * @submodule moodle-course-util-cm
+ */
+
+Y.namespace('Moodle.core_course.util.cm');
+
+/**
+ * A collection of utility classes for use with course modules.
+ *
+ * @class Moodle.core_course.util.cm
+ * @static
+ */
+Y.Moodle.core_course.util.cm = {
+ CONSTANTS: {
+ MODULEIDPREFIX : 'module-'
+ },
+ SELECTORS: {
+ COURSEMODULE: '.activity',
+ INSTANCENAME: '.instancename'
+ },
+
+ /**
+ * Retrieve the course module item from one of it's child Nodes.
+ *
+ * @method getCourseModuleNodeFromComponent
+ * @param coursemodulecomponent {Node} The component Node.
+ * @return {Node|null} The Course Module Node.
+ */
+ getCourseModuleFromComponent: function(coursemodulecomponent) {
+ return Y.one(coursemodulecomponent).ancestor(this.SELECTORS.COURSEMODULE, true);
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getId
+ * @param coursemodule {Node} The course module to find an ID for.
+ * @return {Number|false} The ID of the course module in question or false if no ID was found.
+ */
+ getId: function(coursemodule) {
+ // We perform a simple substitution operation to get the ID.
+ var id = coursemodule.get('id').replace(
+ this.CONSTANTS.MODULEIDPREFIX, '');
+
+ // Attempt to validate the ID.
+ id = parseInt(id, 10);
+ if (typeof id === 'number' && isFinite(id)) {
+ return id;
+ }
+ return false;
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getName
+ * @param coursemodule {Node} The course module to find an ID for.
+ * @return {Number|false} The ID of the course module in question or false if no ID was found.
+ */
+ getName: function(coursemodule) {
+ var instance = coursemodule.one(this.SELECTORS.INSTANCENAME);
+ if (instance) {
+ return instance.get('firstChild').get('data');
+ }
+ return null;
+ }
+};
+
+
+}, '@VERSION@', {"requires": ["node", "moodle-course-util-base"]});
diff --git a/course/yui/build/moodle-course-util-cm/moodle-course-util-cm-min.js b/course/yui/build/moodle-course-util-cm/moodle-course-util-cm-min.js
new file mode 100644
index 00000000000..aa486121e04
--- /dev/null
+++ b/course/yui/build/moodle-course-util-cm/moodle-course-util-cm-min.js
@@ -0,0 +1 @@
+YUI.add("moodle-course-util-cm",function(e,t){e.namespace("Moodle.core_course.util.cm"),e.Moodle.core_course.util.cm={CONSTANTS:{MODULEIDPREFIX:"module-"},SELECTORS:{COURSEMODULE:".activity",INSTANCENAME:".instancename"},getCourseModuleFromComponent:function(t){return e.one(t).ancestor(this.SELECTORS.COURSEMODULE,!0)},getId:function(e){var t=e.get("id").replace(this.CONSTANTS.MODULEIDPREFIX,"");return t=parseInt(t,10),typeof t=="number"&&isFinite(t)?t:!1},getName:function(e){var t=e.one(this.SELECTORS.INSTANCENAME);return t?t.get("firstChild").get("data"):null}}},"@VERSION@",{requires:["node","moodle-course-util-base"]});
diff --git a/course/yui/build/moodle-course-util-cm/moodle-course-util-cm.js b/course/yui/build/moodle-course-util-cm/moodle-course-util-cm.js
new file mode 100644
index 00000000000..aef40c5055a
--- /dev/null
+++ b/course/yui/build/moodle-course-util-cm/moodle-course-util-cm.js
@@ -0,0 +1,75 @@
+YUI.add('moodle-course-util-cm', function (Y, NAME) {
+
+/**
+ * A collection of utility classes for use with course modules.
+ *
+ * @module moodle-course-util
+ * @submodule moodle-course-util-cm
+ */
+
+Y.namespace('Moodle.core_course.util.cm');
+
+/**
+ * A collection of utility classes for use with course modules.
+ *
+ * @class Moodle.core_course.util.cm
+ * @static
+ */
+Y.Moodle.core_course.util.cm = {
+ CONSTANTS: {
+ MODULEIDPREFIX : 'module-'
+ },
+ SELECTORS: {
+ COURSEMODULE: '.activity',
+ INSTANCENAME: '.instancename'
+ },
+
+ /**
+ * Retrieve the course module item from one of it's child Nodes.
+ *
+ * @method getCourseModuleNodeFromComponent
+ * @param coursemodulecomponent {Node} The component Node.
+ * @return {Node|null} The Course Module Node.
+ */
+ getCourseModuleFromComponent: function(coursemodulecomponent) {
+ return Y.one(coursemodulecomponent).ancestor(this.SELECTORS.COURSEMODULE, true);
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getId
+ * @param coursemodule {Node} The course module to find an ID for.
+ * @return {Number|false} The ID of the course module in question or false if no ID was found.
+ */
+ getId: function(coursemodule) {
+ // We perform a simple substitution operation to get the ID.
+ var id = coursemodule.get('id').replace(
+ this.CONSTANTS.MODULEIDPREFIX, '');
+
+ // Attempt to validate the ID.
+ id = parseInt(id, 10);
+ if (typeof id === 'number' && isFinite(id)) {
+ return id;
+ }
+ return false;
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getName
+ * @param coursemodule {Node} The course module to find an ID for.
+ * @return {Number|false} The ID of the course module in question or false if no ID was found.
+ */
+ getName: function(coursemodule) {
+ var instance = coursemodule.one(this.SELECTORS.INSTANCENAME);
+ if (instance) {
+ return instance.get('firstChild').get('data');
+ }
+ return null;
+ }
+};
+
+
+}, '@VERSION@', {"requires": ["node", "moodle-course-util-base"]});
diff --git a/course/yui/build/moodle-course-util-section/moodle-course-util-section-debug.js b/course/yui/build/moodle-course-util-section/moodle-course-util-section-debug.js
new file mode 100644
index 00000000000..9e38dcb0b4b
--- /dev/null
+++ b/course/yui/build/moodle-course-util-section/moodle-course-util-section-debug.js
@@ -0,0 +1,45 @@
+YUI.add('moodle-course-util-section', function (Y, NAME) {
+
+/**
+ * A collection of utility classes for use with course sections.
+ *
+ * @module moodle-course-util
+ * @submodule moodle-course-util-section
+ */
+
+Y.namespace('Moodle.core_course.util.section');
+
+/**
+ * A collection of utility classes for use with course sections.
+ *
+ * @class Moodle.core_course.util.section
+ * @static
+ */
+Y.Moodle.core_course.util.section = {
+ CONSTANTS: {
+ SECTIONIDPREFIX : 'section-'
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getId
+ * @param section {Node} The section to find an ID for.
+ * @return {Number|false} The ID of the section in question or false if no ID was found.
+ */
+ getId: function(section) {
+ // We perform a simple substitution operation to get the ID.
+ var id = section.get('id').replace(
+ this.CONSTANTS.SECTIONIDPREFIX, '');
+
+ // Attempt to validate the ID.
+ id = parseInt(id, 10);
+ if (typeof id === 'number' && isFinite(id)) {
+ return id;
+ }
+ return false;
+ }
+};
+
+
+}, '@VERSION@', {"requires": ["node", "moodle-course-util-base"]});
diff --git a/course/yui/build/moodle-course-util-section/moodle-course-util-section-min.js b/course/yui/build/moodle-course-util-section/moodle-course-util-section-min.js
new file mode 100644
index 00000000000..fe8775fea43
--- /dev/null
+++ b/course/yui/build/moodle-course-util-section/moodle-course-util-section-min.js
@@ -0,0 +1 @@
+YUI.add("moodle-course-util-section",function(e,t){e.namespace("Moodle.core_course.util.section"),e.Moodle.core_course.util.section={CONSTANTS:{SECTIONIDPREFIX:"section-"},getId:function(e){var t=e.get("id").replace(this.CONSTANTS.SECTIONIDPREFIX,"");return t=parseInt(t,10),typeof t=="number"&&isFinite(t)?t:!1}}},"@VERSION@",{requires:["node","moodle-course-util-base"]});
diff --git a/course/yui/build/moodle-course-util-section/moodle-course-util-section.js b/course/yui/build/moodle-course-util-section/moodle-course-util-section.js
new file mode 100644
index 00000000000..9e38dcb0b4b
--- /dev/null
+++ b/course/yui/build/moodle-course-util-section/moodle-course-util-section.js
@@ -0,0 +1,45 @@
+YUI.add('moodle-course-util-section', function (Y, NAME) {
+
+/**
+ * A collection of utility classes for use with course sections.
+ *
+ * @module moodle-course-util
+ * @submodule moodle-course-util-section
+ */
+
+Y.namespace('Moodle.core_course.util.section');
+
+/**
+ * A collection of utility classes for use with course sections.
+ *
+ * @class Moodle.core_course.util.section
+ * @static
+ */
+Y.Moodle.core_course.util.section = {
+ CONSTANTS: {
+ SECTIONIDPREFIX : 'section-'
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getId
+ * @param section {Node} The section to find an ID for.
+ * @return {Number|false} The ID of the section in question or false if no ID was found.
+ */
+ getId: function(section) {
+ // We perform a simple substitution operation to get the ID.
+ var id = section.get('id').replace(
+ this.CONSTANTS.SECTIONIDPREFIX, '');
+
+ // Attempt to validate the ID.
+ id = parseInt(id, 10);
+ if (typeof id === 'number' && isFinite(id)) {
+ return id;
+ }
+ return false;
+ }
+};
+
+
+}, '@VERSION@', {"requires": ["node", "moodle-course-util-base"]});
diff --git a/course/yui/dragdrop/dragdrop.js b/course/yui/dragdrop/dragdrop.js
index fc5f88d2e40..d7d8d4e89d9 100644
--- a/course/yui/dragdrop/dragdrop.js
+++ b/course/yui/dragdrop/dragdrop.js
@@ -17,7 +17,8 @@ YUI.add('moodle-course-dragdrop', function(Y) {
SECTION : 'section',
SECTIONADDMENUS : 'section_add_menus',
SECTIONHANDLE : 'section-handle',
- SUMMARY : 'summary'
+ SUMMARY : 'summary',
+ SECTIONDRAGGABLE: 'sectiondraggable'
};
var DRAGSECTION = function() {
@@ -28,7 +29,7 @@ YUI.add('moodle-course-dragdrop', function(Y) {
initializer : function(params) {
// Set group for parent class
- this.groups = ['section'];
+ this.groups = [ CSS.SECTIONDRAGGABLE ];
this.samenodeclass = M.course.format.get_sectionwrapperclass();
this.parentnodeclass = M.course.format.get_containerclass();
@@ -40,13 +41,13 @@ YUI.add('moodle-course-dragdrop', function(Y) {
this.sectionlistselector = M.course.format.get_section_wrapper(Y);
if (this.sectionlistselector) {
this.sectionlistselector = '.'+CSS.COURSECONTENT+' '+this.sectionlistselector;
+
this.setup_for_section(this.sectionlistselector);
// Make each li element in the lists of sections draggable
- var nodeselector = this.sectionlistselector.slice(CSS.COURSECONTENT.length+2);
var del = new Y.DD.Delegate({
container: '.'+CSS.COURSECONTENT,
- nodes: nodeselector,
+ nodes: '.' + CSS.SECTIONDRAGGABLE,
target: true,
handles: ['.'+CSS.LEFT],
dragConfig: {groups: this.groups}
@@ -73,7 +74,7 @@ YUI.add('moodle-course-dragdrop', function(Y) {
setup_for_section : function(baseselector) {
Y.Node.all(baseselector).each(function(sectionnode) {
// Determine the section ID
- var sectionid = this.get_section_id(sectionnode);
+ var sectionid = Y.Moodle.core_course.util.section.getId(sectionnode);
// We skip the top section as it is not draggable
if (sectionid > 0) {
@@ -95,15 +96,14 @@ YUI.add('moodle-course-dragdrop', function(Y) {
if (movedown) {
movedown.remove();
}
+
+ // This section can be moved - add the class to indicate this to Y.DD.
+ sectionnode.addClass(CSS.SECTIONDRAGGABLE);
}
}
}, this);
},
- get_section_id : function(node) {
- return Number(node.get('id').replace(/section-/i, ''));
- },
-
/*
* Drag-dropping related functions
*/
@@ -135,8 +135,8 @@ YUI.add('moodle-course-dragdrop', function(Y) {
var dragnode = drag.get('node');
var dropnode = e.drop.get('node');
// Prepare some variables
- var dragnodeid = Number(this.get_section_id(dragnode));
- var dropnodeid = Number(this.get_section_id(dropnode));
+ var dragnodeid = Y.Moodle.core_course.util.section.getId(dragnode);
+ var dropnodeid = Y.Moodle.core_course.util.section.getId(dropnode);
var loopstart = dragnodeid;
var loopend = dropnodeid;
@@ -195,7 +195,7 @@ YUI.add('moodle-course-dragdrop', function(Y) {
do {
var swapped = false;
for (var i = loopstart; i <= loopend; i++) {
- if (this.get_section_id(sectionlist.item(i-1)) > this.get_section_id(sectionlist.item(i))) {
+ if (Y.Moodle.core_course.util.section.getId(sectionlist.item(i-1)) > Y.Moodle.core_course.util.section.getId(sectionlist.item(i))) {
// Swap section id
var sectionid = sectionlist.item(i-1).get('id');
sectionlist.item(i-1).set('id', sectionlist.item(i).get('id'));
@@ -323,14 +323,6 @@ YUI.add('moodle-course-dragdrop', function(Y) {
}, this);
},
- get_section_id : function(node) {
- return Number(node.get('id').replace(/section-/i, ''));
- },
-
- get_resource_id : function(node) {
- return Number(node.get('id').replace(/module-/i, ''));
- },
-
drag_start : function(e) {
// Get our drag object
var drag = e.target;
@@ -367,11 +359,11 @@ YUI.add('moodle-course-dragdrop', function(Y) {
params.courseId = this.get('courseid');
params['class'] = 'resource';
params.field = 'move';
- params.id = Number(this.get_resource_id(dragnode));
- params.sectionId = this.get_section_id(dropnode.ancestor(M.course.format.get_section_wrapper(Y), true));
+ params.id = Number(Y.Moodle.core_course.util.cm.getId(dragnode));
+ params.sectionId = Y.Moodle.core_course.util.section.getId(dropnode.ancestor(M.course.format.get_section_wrapper(Y), true));
if (dragnode.next()) {
- params.beforeId = Number(this.get_resource_id(dragnode.next()));
+ params.beforeId = Number(Y.Moodle.core_course.util.cm.getId(dragnode.next()));
}
// Do AJAX request
@@ -426,4 +418,4 @@ YUI.add('moodle-course-dragdrop', function(Y) {
M.course.init_section_dragdrop = function(params) {
new DRAGSECTION(params);
}
-}, '@VERSION@', {requires:['base', 'node', 'io', 'dom', 'dd', 'dd-scroll', 'moodle-core-dragdrop', 'moodle-core-notification', 'moodle-course-coursebase']});
+}, '@VERSION@', {requires:['base', 'node', 'io', 'dom', 'dd', 'dd-scroll', 'moodle-core-dragdrop', 'moodle-core-notification', 'moodle-course-coursebase', 'moodle-course-util']});
diff --git a/course/yui/src/util/build.json b/course/yui/src/util/build.json
new file mode 100644
index 00000000000..4ecd0ab26e7
--- /dev/null
+++ b/course/yui/src/util/build.json
@@ -0,0 +1,20 @@
+{
+ "name": "moodle-course-util",
+ "builds": {
+ "moodle-course-util-base": {
+ "jsfiles": [
+ "base.js"
+ ]
+ },
+ "moodle-course-util-section": {
+ "jsfiles": [
+ "section.js"
+ ]
+ },
+ "moodle-course-util-cm": {
+ "jsfiles": [
+ "cm.js"
+ ]
+ }
+ }
+}
diff --git a/course/yui/src/util/js/base.js b/course/yui/src/util/js/base.js
new file mode 100644
index 00000000000..4c3240df5f5
--- /dev/null
+++ b/course/yui/src/util/js/base.js
@@ -0,0 +1,16 @@
+/**
+ * The Moodle.core_course.util classes provide course-related utility functions.
+ *
+ * @module moodle-course-util
+ * @main
+ */
+
+Y.namespace('Moodle.core_course.util');
+
+/**
+ * A collection of general utility functions for use in course.
+ *
+ * @class Moodle.core_course.util
+ * @static
+ */
+
diff --git a/course/yui/src/util/js/cm.js b/course/yui/src/util/js/cm.js
new file mode 100644
index 00000000000..a6884fab3af
--- /dev/null
+++ b/course/yui/src/util/js/cm.js
@@ -0,0 +1,70 @@
+/**
+ * A collection of utility classes for use with course modules.
+ *
+ * @module moodle-course-util
+ * @submodule moodle-course-util-cm
+ */
+
+Y.namespace('Moodle.core_course.util.cm');
+
+/**
+ * A collection of utility classes for use with course modules.
+ *
+ * @class Moodle.core_course.util.cm
+ * @static
+ */
+Y.Moodle.core_course.util.cm = {
+ CONSTANTS: {
+ MODULEIDPREFIX : 'module-'
+ },
+ SELECTORS: {
+ COURSEMODULE: '.activity',
+ INSTANCENAME: '.instancename'
+ },
+
+ /**
+ * Retrieve the course module item from one of it's child Nodes.
+ *
+ * @method getCourseModuleNodeFromComponent
+ * @param coursemodulecomponent {Node} The component Node.
+ * @return {Node|null} The Course Module Node.
+ */
+ getCourseModuleFromComponent: function(coursemodulecomponent) {
+ return Y.one(coursemodulecomponent).ancestor(this.SELECTORS.COURSEMODULE, true);
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getId
+ * @param coursemodule {Node} The course module to find an ID for.
+ * @return {Number|false} The ID of the course module in question or false if no ID was found.
+ */
+ getId: function(coursemodule) {
+ // We perform a simple substitution operation to get the ID.
+ var id = coursemodule.get('id').replace(
+ this.CONSTANTS.MODULEIDPREFIX, '');
+
+ // Attempt to validate the ID.
+ id = parseInt(id, 10);
+ if (typeof id === 'number' && isFinite(id)) {
+ return id;
+ }
+ return false;
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getName
+ * @param coursemodule {Node} The course module to find an ID for.
+ * @return {Number|false} The ID of the course module in question or false if no ID was found.
+ */
+ getName: function(coursemodule) {
+ var instance = coursemodule.one(this.SELECTORS.INSTANCENAME);
+ if (instance) {
+ return instance.get('firstChild').get('data');
+ }
+ return null;
+ }
+};
diff --git a/course/yui/src/util/js/section.js b/course/yui/src/util/js/section.js
new file mode 100644
index 00000000000..1c02f7556b7
--- /dev/null
+++ b/course/yui/src/util/js/section.js
@@ -0,0 +1,40 @@
+/**
+ * A collection of utility classes for use with course sections.
+ *
+ * @module moodle-course-util
+ * @submodule moodle-course-util-section
+ */
+
+Y.namespace('Moodle.core_course.util.section');
+
+/**
+ * A collection of utility classes for use with course sections.
+ *
+ * @class Moodle.core_course.util.section
+ * @static
+ */
+Y.Moodle.core_course.util.section = {
+ CONSTANTS: {
+ SECTIONIDPREFIX : 'section-'
+ },
+
+ /**
+ * Determines the section ID for the provided section.
+ *
+ * @method getId
+ * @param section {Node} The section to find an ID for.
+ * @return {Number|false} The ID of the section in question or false if no ID was found.
+ */
+ getId: function(section) {
+ // We perform a simple substitution operation to get the ID.
+ var id = section.get('id').replace(
+ this.CONSTANTS.SECTIONIDPREFIX, '');
+
+ // Attempt to validate the ID.
+ id = parseInt(id, 10);
+ if (typeof id === 'number' && isFinite(id)) {
+ return id;
+ }
+ return false;
+ }
+};
diff --git a/course/yui/src/util/meta/util.json b/course/yui/src/util/meta/util.json
new file mode 100644
index 00000000000..5a35ea2607c
--- /dev/null
+++ b/course/yui/src/util/meta/util.json
@@ -0,0 +1,26 @@
+{
+ "moodle-course-util": {
+ "requires": [
+ "node"
+ ],
+ "use": [
+ "moodle-course-util-base"
+ ],
+ "submodules": {
+ "moodle-course-util-base": {
+ },
+ "moodle-course-util-section": {
+ "requires": [
+ "node",
+ "moodle-course-util-base"
+ ]
+ },
+ "moodle-course-util-cm": {
+ "requires": [
+ "node",
+ "moodle-course-util-base"
+ ]
+ }
+ }
+ }
+}
diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js
index 2b160b8710e..2dad9f05cbd 100644
--- a/course/yui/toolboxes/toolboxes.js
+++ b/course/yui/toolboxes/toolboxes.js
@@ -123,38 +123,6 @@ YUI.add('moodle-course-toolboxes', function(Y) {
// Send the request
Y.io(uri, config);
return responsetext;
- },
- /**
- * Return the name of the activity instance
- *
- * If activity has no name (for example label) null is returned
- *
- * @param element The element to determine a name for
- * @return string|null Instance name
- */
- get_instance_name : function(target) {
- if (target.one(SELECTOR.INSTANCENAME)) {
- return target.one(SELECTOR.INSTANCENAME).get('firstChild').get('data');
- }
- return null;
- },
- /**
- * Return the module ID for the specified element
- *
- * @param element The element to determine a module-id number for
- * @return string The module ID
- */
- get_element_id : function(element) {
- return element.get('id').replace(CSS.MODULEIDPREFIX, '');
- },
- /**
- * Return the module ID for the specified element
- *
- * @param element The element to determine a module-id number for
- * @return string The module ID
- */
- get_section_id : function(section) {
- return section.get('id').replace(CSS.SECTIONIDPREFIX, '');
}
},
{
@@ -343,7 +311,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
'class' : 'resource',
'field' : 'indent',
'value' : newindent,
- 'id' : this.get_element_id(activity)
+ 'id' : Y.Moodle.core_course.util.cm.getId(activity)
};
var commands = activity.one(SELECTOR.COMMANDSPAN);
var spinner = M.util.add_spinner(Y, commands).setStyles({
@@ -395,8 +363,8 @@ YUI.add('moodle-course-toolboxes', function(Y) {
var plugindata = {
type : M.util.get_string('pluginname', element.getAttribute('class').match(/modtype_([^\s]*)/)[1])
}
- if (this.get_instance_name(element) != null) {
- plugindata.name = this.get_instance_name(element)
+ if (Y.Moodle.core_course.util.cm.getName(element) != null) {
+ plugindata.name = Y.Moodle.core_course.util.cm.getName(element)
confirmstring = M.util.get_string('deletechecktypename', 'moodle', plugindata);
} else {
confirmstring = M.util.get_string('deletechecktype', 'moodle', plugindata)
@@ -412,7 +380,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
var data = {
'class' : 'resource',
'action' : 'DELETE',
- 'id' : this.get_element_id(element)
+ 'id' : Y.Moodle.core_course.util.cm.getId(element)
};
this.send_request(data);
if (M.core.actionmenu && M.core.actionmenu.instance) {
@@ -450,7 +418,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
'class' : 'resource',
'field' : 'visible',
'value' : value,
- 'id' : this.get_element_id(element)
+ 'id' : Y.Moodle.core_course.util.cm.getId(element)
};
var spinner = M.util.add_spinner(Y, element.one(SELECTOR.COMMANDSPAN));
this.send_request(data, spinner);
@@ -484,7 +452,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
button.setData('action', newstatus);
// If activity is conditionally hidden, then don't toggle.
- if (this.get_instance_name(activity) == null) {
+ if (Y.Moodle.core_course.util.cm.getName(activity) == null) {
toggleclass = CSS.DIMMEDTEXT;
dimarea = activity.all(SELECTOR.MODINDENTDIV + ' > div').item(1);
}
@@ -554,7 +522,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
'class' : 'resource',
'field' : 'groupmode',
'value' : groupmode,
- 'id' : this.get_element_id(activity)
+ 'id' : Y.Moodle.core_course.util.cm.getId(activity)
};
spinner = M.util.add_spinner(Y, activity.one(SELECTOR.COMMANDSPAN));
@@ -575,7 +543,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
*/
edit_title : function(ev, button, activity) {
// Get the element we're working on
- var activityid = this.get_element_id(activity),
+ var activityid = Y.Moodle.core_course.util.cm.getId(activity),
instancename = activity.one(SELECTOR.INSTANCENAME),
currenttitle = instancename.get('firstChild'),
oldtitle = currenttitle.get('data'),
@@ -652,7 +620,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
'class' : 'resource',
'field' : 'updatetitle',
'title' : newtitle,
- 'id' : this.get_element_id(activity)
+ 'id' : Y.Moodle.core_course.util.cm.getId(activity)
};
var response = this.send_request(data, spinner);
if (response.instancename) {
@@ -811,7 +779,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
var data = {
'class' : 'section',
'field' : 'visible',
- 'id' : this.get_section_id(section.ancestor(M.course.format.get_section_wrapper(Y), true)),
+ 'id' : Y.Moodle.core_course.util.section.getId(section.ancestor(M.course.format.get_section_wrapper(Y), true)),
'value' : value
};
@@ -827,9 +795,11 @@ YUI.add('moodle-course-toolboxes', function(Y) {
} else {
var button = node.one(SELECTOR.HIDE);
}
- var activityid = this.get_element_id(node);
+ var activityid = Y.Moodle.core_course.util.cm.getId(node);
- if (Y.Array.indexOf(response.resourcestotoggle, activityid) != -1) {
+ // NOTE: resourcestotoggle is returned as a string instead
+ // of a Number so we must cast our activityid to a String.
+ if (Y.Array.indexOf(response.resourcestotoggle, "" + activityid) != -1) {
node.getData('toolbox').handle_resource_dim(button, node, oldstatus);
}
}, this);
@@ -864,7 +834,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
// Then add it if required to the selected section
if (!togglestatus) {
section.addClass('current');
- value = this.get_section_id(section.ancestor(M.course.format.get_section_wrapper(Y), true));
+ value = Y.Moodle.core_course.util.section.getId(section.ancestor(M.course.format.get_section_wrapper(Y), true));
var new_string = M.util.get_string('markedthistopic', 'moodle');
button
.set('title', new_string);
diff --git a/draftfile.php b/draftfile.php
index 821ae576650..ce61d199e0c 100644
--- a/draftfile.php
+++ b/draftfile.php
@@ -84,5 +84,5 @@ if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->get_filename() ==
// ========================================
// finally send the file
// ========================================
-session_get_instance()->write_close(); // unlock session during fileserving
+\core\session\manager::write_close(); // Unlock session during file serving.
send_stored_file($file, 0, false, true, array('preview' => $preview)); // force download - security first!
diff --git a/enrol/index.php b/enrol/index.php
index d0e91b53443..3cc533507c0 100644
--- a/enrol/index.php
+++ b/enrol/index.php
@@ -46,7 +46,7 @@ $PAGE->set_pagelayout('course');
$PAGE->set_url('/enrol/index.php', array('id'=>$course->id));
// do not allow enrols when in login-as session
-if (session_is_loggedinas() and $USER->loginascontext->contextlevel == CONTEXT_COURSE) {
+if (\core\session\manager::is_loggedinas() and $USER->loginascontext->contextlevel == CONTEXT_COURSE) {
print_error('loginasnoenrol', '', $CFG->wwwroot.'/course/view.php?id='.$USER->loginascontext->instanceid);
}
diff --git a/enrol/ldap/lang/en/enrol_ldap.php b/enrol/ldap/lang/en/enrol_ldap.php
index 4d850327ca4..70a3d3ee0b8 100644
--- a/enrol/ldap/lang/en/enrol_ldap.php
+++ b/enrol/ldap/lang/en/enrol_ldap.php
@@ -28,12 +28,18 @@ $string['assignrolefailed'] = "Failed to assign role '{\$a->role_shortname}' to
$string['autocreate'] = '
@@ -668,7 +668,6 @@
+
+
+
-
\ No newline at end of file
+
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 543d1b3dd68..d68ce2833d9 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2450,5 +2450,110 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013091300.01);
}
+ if ($oldversion < 2013092000.01) {
+
+ // Define table question_statistics to be created.
+ $table = new xmldb_table('question_statistics');
+
+ // Adding fields to table question_statistics.
+ $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
+ $table->add_field('hashcode', XMLDB_TYPE_CHAR, '40', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('timemodified', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('questionid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('slot', XMLDB_TYPE_INTEGER, '10', null, null, null, null);
+ $table->add_field('subquestion', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('s', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('effectiveweight', XMLDB_TYPE_NUMBER, '15, 5', null, null, null, null);
+ $table->add_field('negcovar', XMLDB_TYPE_INTEGER, '2', null, XMLDB_NOTNULL, null, '0');
+ $table->add_field('discriminationindex', XMLDB_TYPE_NUMBER, '15, 5', null, null, null, null);
+ $table->add_field('discriminativeefficiency', XMLDB_TYPE_NUMBER, '15, 5', null, null, null, null);
+ $table->add_field('sd', XMLDB_TYPE_NUMBER, '15, 10', null, null, null, null);
+ $table->add_field('facility', XMLDB_TYPE_NUMBER, '15, 10', null, null, null, null);
+ $table->add_field('subquestions', XMLDB_TYPE_TEXT, null, null, null, null, null);
+ $table->add_field('maxmark', XMLDB_TYPE_NUMBER, '12, 7', null, null, null, null);
+ $table->add_field('positions', XMLDB_TYPE_TEXT, null, null, null, null, null);
+ $table->add_field('randomguessscore', XMLDB_TYPE_NUMBER, '12, 7', null, null, null, null);
+
+ // Adding keys to table question_statistics.
+ $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
+
+ // Conditionally launch create table for question_statistics.
+ if (!$dbman->table_exists($table)) {
+ $dbman->create_table($table);
+ }
+
+ // Define table question_response_analysis to be created.
+ $table = new xmldb_table('question_response_analysis');
+
+ // Adding fields to table question_response_analysis.
+ $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
+ $table->add_field('hashcode', XMLDB_TYPE_CHAR, '40', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('timemodified', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('questionid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('subqid', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('aid', XMLDB_TYPE_CHAR, '100', null, null, null, null);
+ $table->add_field('response', XMLDB_TYPE_TEXT, null, null, null, null, null);
+ $table->add_field('rcount', XMLDB_TYPE_INTEGER, '10', null, null, null, null);
+ $table->add_field('credit', XMLDB_TYPE_NUMBER, '15, 5', null, XMLDB_NOTNULL, null, null);
+
+ // Adding keys to table question_response_analysis.
+ $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
+
+ // Conditionally launch create table for question_response_analysis.
+ if (!$dbman->table_exists($table)) {
+ $dbman->create_table($table);
+ }
+
+ // Main savepoint reached.
+ upgrade_main_savepoint(true, 2013092000.01);
+ }
+
+ if ($oldversion < 2013092001.01) {
+ // Force uninstall of deleted tool.
+ if (!file_exists("$CFG->dirroot/$CFG->admin/tool/bloglevelupgrade")) {
+ // Remove capabilities.
+ capabilities_cleanup('tool_bloglevelupgrade');
+ // Remove all other associated config.
+ unset_all_config_for_plugin('tool_bloglevelupgrade');
+ }
+ upgrade_main_savepoint(true, 2013092001.01);
+ }
+
+ if ($oldversion < 2013092001.02) {
+ // Define field version to be dropped from modules.
+ $table = new xmldb_table('modules');
+ $field = new xmldb_field('version');
+
+ // Conditionally launch drop field version.
+ if ($dbman->field_exists($table, $field)) {
+ // Migrate all plugin version info to config_plugins table.
+ $modules = $DB->get_records('modules');
+ foreach ($modules as $module) {
+ set_config('version', $module->version, 'mod_'.$module->name);
+ }
+ unset($modules);
+
+ $dbman->drop_field($table, $field);
+ }
+
+ // Define field version to be dropped from block.
+ $table = new xmldb_table('block');
+ $field = new xmldb_field('version');
+
+ // Conditionally launch drop field version.
+ if ($dbman->field_exists($table, $field)) {
+ $blocks = $DB->get_records('block');
+ foreach ($blocks as $block) {
+ set_config('version', $block->version, 'block_'.$block->name);
+ }
+ unset($blocks);
+
+ $dbman->drop_field($table, $field);
+ }
+
+ // Main savepoint reached.
+ upgrade_main_savepoint(true, 2013092001.02);
+ }
+
return true;
}
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 3cc26edb3e2..6ef7851d6eb 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -30,6 +30,140 @@
defined('MOODLE_INTERNAL') || die();
+/**
+ * Factory method that was returning moodle_session object.
+ *
+ * @deprecated since 2.6
+ * @return \core\session\manager
+ */
+function session_get_instance() {
+ // Note: the new session manager includes all methods from the original session class.
+ static $deprecatedinstance = null;
+
+ debugging('session_get_instance() is deprecated, use \core\session\manager instead', DEBUG_DEVELOPER);
+
+ if (!$deprecatedinstance) {
+ $deprecatedinstance = new \core\session\manager();
+ }
+
+ return $deprecatedinstance;
+}
+
+/**
+ * Returns true if legacy session used.
+ *
+ * @deprecated since 2.6
+ * @return bool
+ */
+function session_is_legacy() {
+ debugging('session_is_legacy() is deprecated, do not use any more', DEBUG_DEVELOPER);
+ return false;
+}
+
+/**
+ * Terminates all sessions, auth hooks are not executed.
+ * Useful in upgrade scripts.
+ *
+ * @deprecated since 2.6
+ */
+function session_kill_all() {
+ debugging('session_kill_all() is deprecated, use \core\session\manager::kill_all_sessions() instead', DEBUG_DEVELOPER);
+ \core\session\manager::kill_all_sessions();
+}
+
+/**
+ * Mark session as accessed, prevents timeouts.
+ *
+ * @deprecated since 2.6
+ * @param string $sid
+ */
+function session_touch($sid) {
+ debugging('session_touch() is deprecated, use \core\session\manager::touch_session() instead', DEBUG_DEVELOPER);
+ \core\session\manager::touch_session($sid);
+}
+
+/**
+ * Terminates one sessions, auth hooks are not executed.
+ *
+ * @deprecated since 2.6
+ * @param string $sid session id
+ */
+function session_kill($sid) {
+ debugging('session_kill() is deprecated, use \core\session\manager::kill_session() instead', DEBUG_DEVELOPER);
+ \core\session\manager::kill_session($sid);
+}
+
+/**
+ * Terminates all sessions of one user, auth hooks are not executed.
+ * NOTE: This can not work for file based sessions!
+ *
+ * @deprecated since 2.6
+ * @param int $userid user id
+ */
+function session_kill_user($userid) {
+ debugging('session_kill_user() is deprecated, use \core\session\manager::kill_user_sessions() instead', DEBUG_DEVELOPER);
+ \core\session\manager::kill_user_sessions($userid);
+}
+
+/**
+ * Session garbage collection
+ * - verify timeout for all users
+ * - kill sessions of all deleted users
+ * - kill sessions of users with disabled plugins or 'nologin' plugin
+ *
+ * @deprecated since 2.6
+ */
+function session_gc() {
+ debugging('session_gc() is deprecated, use \core\session\manager::gc() instead', DEBUG_DEVELOPER);
+ \core\session\manager::gc();
+}
+
+/**
+ * Setup $USER object - called during login, loginas, etc.
+ *
+ * Call sync_user_enrolments() manually after log-in, or log-in-as.
+ *
+ * @deprecated since 2.6
+ * @param stdClass $user full user record object
+ * @return void
+ */
+function session_set_user($user) {
+ debugging('session_set_user() is deprecated, use \core\session\manager::set_user() instead', DEBUG_DEVELOPER);
+ \core\session\manager::set_user($user);
+}
+
+/**
+ * Is current $USER logged-in-as somebody else?
+ * @deprecated since 2.6
+ * @return bool
+ */
+function session_is_loggedinas() {
+ debugging('session_is_loggedinas() is deprecated, use \core\session\manager::is_loggedinas() instead', DEBUG_DEVELOPER);
+ return \core\session\manager::is_loggedinas();
+}
+
+/**
+ * Returns the $USER object ignoring current login-as session
+ * @deprecated since 2.6
+ * @return stdClass user object
+ */
+function session_get_realuser() {
+ debugging('session_get_realuser() is deprecated, use \core\session\manager::get_realuser() instead', DEBUG_DEVELOPER);
+ return \core\session\manager::get_realuser();
+}
+
+/**
+ * Login as another user - no security checks here.
+ * @deprecated since 2.6
+ * @param int $userid
+ * @param stdClass $context
+ * @return void
+ */
+function session_loginas($userid, $context) {
+ debugging('session_loginas() is deprecated, use \core\session\manager::loginas() instead', DEBUG_DEVELOPER);
+ \core\session\manager::loginas($userid, $context);
+}
+
/**
* Minify JavaScript files.
*
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index c9ab87c60e5..815248758b1 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -119,6 +119,12 @@ abstract class moodle_database {
/** @var string MD5 of settings used for connection. Used by MUC as an identifier. */
private $settingshash;
+ /** @var cache_application for column info */
+ protected $metacache;
+
+ /** @var bool flag marking database instance as disposed */
+ protected $disposed;
+
/**
* @var int internal temporary variable used to fix params. Its used by {@link _fix_sql_params_dollar_callback()}.
*/
@@ -337,6 +343,10 @@ abstract class moodle_database {
* @return void
*/
public function dispose() {
+ if ($this->disposed) {
+ return;
+ }
+ $this->disposed = true;
if ($this->transactions) {
// this should not happen, it usually indicates wrong catching of exceptions,
// because all transactions should be finished manually or in default exception handler.
@@ -354,9 +364,7 @@ abstract class moodle_database {
}
// Always terminate sessions here to make it consistent,
// this is needed because we need to save session to db before closing it.
- if (function_exists('session_get_instance')) {
- session_get_instance()->write_close();
- }
+ \core\session\manager::write_close();
$this->used_for_db_sessions = false;
if ($this->temptables) {
@@ -368,6 +376,10 @@ abstract class moodle_database {
$this->database_manager = null;
}
$this->tables = null;
+
+ // We do not need the MUC cache any more,
+ // if we did not keep it as property it might be already gone before we saved the session.
+ $this->metacache = null;
}
/**
@@ -955,12 +967,27 @@ abstract class moodle_database {
* @return void
*/
public function reset_caches() {
- $this->tables = null;
+ $this->tables = null;
+ $this->metacache = null;
// Purge MUC as well
$identifiers = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
cache_helper::purge_by_definition('core', 'databasemeta', $identifiers);
}
+ /**
+ * Call before using $this->metacache.
+ *
+ * Note: this is necessary because we want to write to database in shutdown handler
+ * and it needs to use the caches, but MUC would be already disposed.
+ */
+ protected function init_caches() {
+ if ($this->metacache) {
+ return;
+ }
+ $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
+ $this->metacache = cache::make('core', 'databasemeta', $properties);
+ }
+
/**
* Returns the sql generator used for db manipulation.
* Used mostly in upgrade.php scripts.
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
index b4def7a0260..88c35755822 100644
--- a/lib/dml/mssql_native_moodle_database.php
+++ b/lib/dml/mssql_native_moodle_database.php
@@ -398,9 +398,8 @@ class mssql_native_moodle_database extends moodle_database {
public function get_columns($table, $usecache=true) {
if ($usecache) {
- $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
- $cache = cache::make('core', 'databasemeta', $properties);
- if ($data = $cache->get($table)) {
+ $this->init_caches();
+ if ($data = $this->metacache->get($table)) {
return $data;
}
}
@@ -496,7 +495,7 @@ class mssql_native_moodle_database extends moodle_database {
$this->free_result($result);
if ($usecache) {
- $result = $cache->set($table, $structure);
+ $result = $this->metacache->set($table, $structure);
}
return $structure;
diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 7a2d31f1707..f80c479259a 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -511,9 +511,8 @@ class mysqli_native_moodle_database extends moodle_database {
public function get_columns($table, $usecache=true) {
if ($usecache) {
- $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
- $cache = cache::make('core', 'databasemeta', $properties);
- if ($data = $cache->get($table)) {
+ $this->init_caches();
+ if ($data = $this->metacache->get($table)) {
return $data;
}
}
@@ -619,7 +618,7 @@ class mysqli_native_moodle_database extends moodle_database {
}
if ($usecache) {
- $result = $cache->set($table, $structure);
+ $result = $this->metacache->set($table, $structure);
}
return $structure;
diff --git a/lib/dml/oci_native_moodle_database.php b/lib/dml/oci_native_moodle_database.php
index 10906b88f95..5f412ef5c3f 100644
--- a/lib/dml/oci_native_moodle_database.php
+++ b/lib/dml/oci_native_moodle_database.php
@@ -470,9 +470,8 @@ class oci_native_moodle_database extends moodle_database {
public function get_columns($table, $usecache=true) {
if ($usecache) {
- $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
- $cache = cache::make('core', 'databasemeta', $properties);
- if ($data = $cache->get($table)) {
+ $this->init_caches();
+ if ($data = $this->metacache->get($table)) {
return $data;
}
}
@@ -664,7 +663,7 @@ class oci_native_moodle_database extends moodle_database {
}
if ($usecache) {
- $result = $cache->set($table, $structure);
+ $result = $this->metacache->set($table, $structure);
}
return $structure;
@@ -1722,6 +1721,10 @@ class oci_native_moodle_database extends moodle_database {
}
}
+ public function session_lock_supported() {
+ return true;
+ }
+
/**
* Obtain session lock
* @param int $rowid id of the row with session record
diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index 7c9792ecf0c..3ae868d4eac 100644
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -385,9 +385,8 @@ class pgsql_native_moodle_database extends moodle_database {
*/
public function get_columns($table, $usecache=true) {
if ($usecache) {
- $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
- $cache = cache::make('core', 'databasemeta', $properties);
- if ($data = $cache->get($table)) {
+ $this->init_caches();
+ if ($data = $this->metacache->get($table)) {
return $data;
}
}
@@ -570,7 +569,7 @@ class pgsql_native_moodle_database extends moodle_database {
pg_free_result($result);
if ($usecache) {
- $result = $cache->set($table, $structure);
+ $result = $this->metacache->set($table, $structure);
}
return $structure;
diff --git a/lib/dml/sqlite3_pdo_moodle_database.php b/lib/dml/sqlite3_pdo_moodle_database.php
index d5a0080bc05..c71119700ea 100644
--- a/lib/dml/sqlite3_pdo_moodle_database.php
+++ b/lib/dml/sqlite3_pdo_moodle_database.php
@@ -201,9 +201,8 @@ class sqlite3_pdo_moodle_database extends pdo_moodle_database {
public function get_columns($table, $usecache=true) {
if ($usecache) {
- $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
- $cache = cache::make('core', 'databasemeta', $properties);
- if ($data = $cache->get($table)) {
+ $this->init_caches();
+ if ($data = $this->metacache->get($table)) {
return $data;
}
}
@@ -300,7 +299,7 @@ class sqlite3_pdo_moodle_database extends pdo_moodle_database {
}
if ($usecache) {
- $result = $cache->set($table, $structure);
+ $result = $this->metacache->set($table, $structure);
}
return $structure;
diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
index b939e9f9307..3d456970be4 100644
--- a/lib/dml/sqlsrv_native_moodle_database.php
+++ b/lib/dml/sqlsrv_native_moodle_database.php
@@ -462,9 +462,8 @@ class sqlsrv_native_moodle_database extends moodle_database {
*/
public function get_columns($table, $usecache = true) {
if ($usecache) {
- $properties = array('dbfamily' => $this->get_dbfamily(), 'settings' => $this->get_settings_hash());
- $cache = cache::make('core', 'databasemeta', $properties);
- if ($data = $cache->get($table)) {
+ $this->init_caches();
+ if ($data = $this->metacache->get($table)) {
return $data;
}
}
@@ -560,7 +559,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
$this->free_result($result);
if ($usecache) {
- $result = $cache->set($table, $structure);
+ $result = $this->metacache->set($table, $structure);
}
return $structure;
diff --git a/lib/editor/atto/lib.php b/lib/editor/atto/lib.php
index f2ec963c1aa..2b9b8a68c6f 100644
--- a/lib/editor/atto/lib.php
+++ b/lib/editor/atto/lib.php
@@ -74,25 +74,20 @@ class atto_texteditor extends texteditor {
* @param null $fpoptions
*/
public function use_editor($elementid, array $options=null, $fpoptions=null) {
- global $PAGE, $CFG;
+ global $PAGE;
$PAGE->requires->yui_module('moodle-editor_atto-editor',
'M.editor_atto.init',
array($this->get_init_params($elementid, $options, $fpoptions)), true);
- require_once($CFG->libdir . '/pluginlib.php');
- $pluginman = plugin_manager::instance();
- $plugins = $pluginman->get_subplugins_of_plugin('editor_atto');
+ $plugins = core_component::get_plugin_list('atto');
- $sortedplugins = array();
-
- foreach ($plugins as $id => $plugin) {
- $sortorder = component_callback($plugin->type . '_' . $plugin->name, 'sort_order', array($elementid));
- $sortedplugins[$sortorder] = $plugin;
+ foreach ($plugins as $name => $fulldir) {
+ $plugins[$name] = component_callback('atto_' . $name, 'sort_order', array($elementid));
}
- ksort($sortedplugins);
- foreach ($sortedplugins as $plugin) {
- component_callback($plugin->type . '_' . $plugin->name, 'init_editor', array($elementid));
+ asort($plugins);
+ foreach ($plugins as $name => $sort) {
+ component_callback('atto_' . $name, 'init_editor', array($elementid));
}
}
diff --git a/lib/editor/atto/plugins/bold/lib.php b/lib/editor/atto/plugins/bold/lib.php
index 35d97c80b09..823a6a0bbce 100644
--- a/lib/editor/atto/plugins/bold/lib.php
+++ b/lib/editor/atto/plugins/bold/lib.php
@@ -31,18 +31,18 @@ defined('MOODLE_INTERNAL') || die();
function atto_bold_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('bold', get_string('bold', 'atto_bold'), 'atto_bold', array('class'=>'icon'));
+ $icon = $OUTPUT->pix_icon('e/bold', get_string('bold', 'atto_bold'), 'moodle', array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_bold-button',
'M.atto_bold.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_bold_sort_order() {
return 0;
diff --git a/lib/editor/atto/plugins/bold/pix/bold.png b/lib/editor/atto/plugins/bold/pix/bold.png
deleted file mode 100644
index 57ee78ee4ba..00000000000
Binary files a/lib/editor/atto/plugins/bold/pix/bold.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/bold/pix/bold.svg b/lib/editor/atto/plugins/bold/pix/bold.svg
deleted file mode 100644
index b4a76d1f7b2..00000000000
--- a/lib/editor/atto/plugins/bold/pix/bold.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
index 210bb078c8e..254c68dffd8 100644
--- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
+++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
@@ -32,7 +32,7 @@ M.atto_bold = M.atto_bold || {
document.execCommand('bold', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
index e843f39d8f3..14ec201a10e 100644
--- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
+++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_bold-button",function(e,t){M.atto_bold=M.atto_bold||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("bold",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"bold",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_bold-button",function(e,t){M.atto_bold=M.atto_bold||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("bold",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"bold",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
index 210bb078c8e..254c68dffd8 100644
--- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
+++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
@@ -32,7 +32,7 @@ M.atto_bold = M.atto_bold || {
document.execCommand('bold', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/bold/yui/src/button/js/button.js b/lib/editor/atto/plugins/bold/yui/src/button/js/button.js
index 5648d91eb6e..0522419dc0d 100644
--- a/lib/editor/atto/plugins/bold/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/bold/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_bold = M.atto_bold || {
document.execCommand('bold', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/clear/lib.php b/lib/editor/atto/plugins/clear/lib.php
index 0e2081c427b..f62f633ebe9 100644
--- a/lib/editor/atto/plugins/clear/lib.php
+++ b/lib/editor/atto/plugins/clear/lib.php
@@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die();
function atto_clear_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('clear',
+ $icon = $OUTPUT->pix_icon('e/clear_formatting',
get_string('clear', 'atto_clear'),
- 'atto_clear',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_clear-button',
'M.atto_clear.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'clear')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_clear_sort_order() {
return 10;
diff --git a/lib/editor/atto/plugins/clear/pix/clear.png b/lib/editor/atto/plugins/clear/pix/clear.png
deleted file mode 100644
index 7f5815b42bb..00000000000
Binary files a/lib/editor/atto/plugins/clear/pix/clear.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/clear/pix/clear.svg b/lib/editor/atto/plugins/clear/pix/clear.svg
deleted file mode 100644
index cce05ef496e..00000000000
--- a/lib/editor/atto/plugins/clear/pix/clear.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
index bcfb7042794..0efa72c4d43 100644
--- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
+++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
@@ -32,7 +32,7 @@ M.atto_clear = M.atto_clear || {
document.execCommand('removeFormat', false);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
index 7716f7bf93b..4a1ad9753bc 100644
--- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
+++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_clear-button",function(e,t){M.atto_clear=M.atto_clear||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("removeFormat",!1)};M.editor_atto.add_toolbar_button(e.elementid,"clear",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_clear-button",function(e,t){M.atto_clear=M.atto_clear||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("removeFormat",!1)};M.editor_atto.add_toolbar_button(e.elementid,"clear",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
index bcfb7042794..0efa72c4d43 100644
--- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
+++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
@@ -32,7 +32,7 @@ M.atto_clear = M.atto_clear || {
document.execCommand('removeFormat', false);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/clear/yui/src/button/js/button.js b/lib/editor/atto/plugins/clear/yui/src/button/js/button.js
index 0430f8b07f0..77d6d1ecc4c 100644
--- a/lib/editor/atto/plugins/clear/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/clear/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_clear = M.atto_clear || {
document.execCommand('removeFormat', false);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/html/lib.php b/lib/editor/atto/plugins/html/lib.php
index f97ed33a837..997585e472c 100644
--- a/lib/editor/atto/plugins/html/lib.php
+++ b/lib/editor/atto/plugins/html/lib.php
@@ -31,18 +31,18 @@ defined('MOODLE_INTERNAL') || die();
function atto_html_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('html', get_string('html', 'atto_html'), 'atto_html', array('class'=>'icon'));
+ $icon = $OUTPUT->pix_icon('e/source_code', get_string('html', 'atto_html'), 'moodle', array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_html-button',
'M.atto_html.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'html')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return array groupname followed by the absolute position within the toolbar
*/
function atto_html_sort_order() {
return 15;
diff --git a/lib/editor/atto/plugins/html/pix/html.png b/lib/editor/atto/plugins/html/pix/html.png
deleted file mode 100644
index 0623bd748d7..00000000000
Binary files a/lib/editor/atto/plugins/html/pix/html.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/html/pix/html.svg b/lib/editor/atto/plugins/html/pix/html.svg
deleted file mode 100644
index fa06412c0ac..00000000000
--- a/lib/editor/atto/plugins/html/pix/html.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js
index 8b32aadd636..d69df9698ce 100644
--- a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js
+++ b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js
@@ -51,7 +51,7 @@ M.atto_html = M.atto_html || {
M.atto_html.ishtml = !M.atto_html.ishtml;
};
- M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js
index bf8e2cc7de3..d22d6508334 100644
--- a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js
+++ b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_html-button",function(e,t){M.atto_html=M.atto_html||{ishtml:!1,init:function(t){var n=function(t,n){t.preventDefault();var r=e.one("#"+n),i=e.one("#"+n+"editable");M.atto_html.ishtml?(M.editor_atto.enable_all_widgets(n),i.setHTML(""),i.append(r.get("value")),r.hide(),i.show()):(M.editor_atto.disable_all_widgets(n),M.editor_atto.enable_widget(n,"html"),r.set("value",i.getHTML()),i.hide(),r.show()),M.atto_html.ishtml=!M.atto_html.ishtml};M.editor_atto.add_toolbar_button(t.elementid,"html",t.icon,n)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_html-button",function(e,t){M.atto_html=M.atto_html||{ishtml:!1,init:function(t){var n=function(t,n){t.preventDefault();var r=e.one("#"+n),i=e.one("#"+n+"editable");M.atto_html.ishtml?(M.editor_atto.enable_all_widgets(n),i.setHTML(""),i.append(r.get("value")),r.hide(),i.show()):(M.editor_atto.disable_all_widgets(n),M.editor_atto.enable_widget(n,"html"),r.set("value",i.getHTML()),i.hide(),r.show()),M.atto_html.ishtml=!M.atto_html.ishtml};M.editor_atto.add_toolbar_button(t.elementid,"html",t.icon,t.group,n)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js
index 8b32aadd636..d69df9698ce 100644
--- a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js
+++ b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js
@@ -51,7 +51,7 @@ M.atto_html = M.atto_html || {
M.atto_html.ishtml = !M.atto_html.ishtml;
};
- M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/html/yui/src/button/js/button.js b/lib/editor/atto/plugins/html/yui/src/button/js/button.js
index 18520ed679d..5b030ad77c2 100644
--- a/lib/editor/atto/plugins/html/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/html/yui/src/button/js/button.js
@@ -49,6 +49,6 @@ M.atto_html = M.atto_html || {
M.atto_html.ishtml = !M.atto_html.ishtml;
};
- M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/image/lib.php b/lib/editor/atto/plugins/image/lib.php
index ed4a2b96eb0..c25c4ec3e48 100644
--- a/lib/editor/atto/plugins/image/lib.php
+++ b/lib/editor/atto/plugins/image/lib.php
@@ -31,9 +31,9 @@ defined('MOODLE_INTERNAL') || die();
function atto_image_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('image',
+ $icon = $OUTPUT->pix_icon('e/insert_edit_image',
get_string('image', 'atto_image'),
- 'atto_image',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->strings_for_js(array('createimage',
@@ -46,14 +46,14 @@ function atto_image_init_editor($elementid) {
'height'), 'atto_image');
$PAGE->requires->yui_module('moodle-atto_image-button',
'M.atto_image.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'file')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_image_sort_order() {
return 13;
diff --git a/lib/editor/atto/plugins/image/pix/image.png b/lib/editor/atto/plugins/image/pix/image.png
deleted file mode 100644
index b5644b23397..00000000000
Binary files a/lib/editor/atto/plugins/image/pix/image.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/image/pix/image.svg b/lib/editor/atto/plugins/image/pix/image.svg
deleted file mode 100644
index 30e6fcf9638..00000000000
--- a/lib/editor/atto/plugins/image/pix/image.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
index 2658d79173d..d8c624d88f3 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -87,7 +87,7 @@ M.atto_image = M.atto_image || {
}
};
- M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this);
+ M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this);
},
open_filepicker : function(e) {
var elementid = this.getAttribute('data-editor');
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
index 6fed538488b..d48973263fd 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"))}r.show()}};M.editor_atto.add_toolbar_button(t.elementid,"image",t.icon,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url),n=e.one("#atto_image_altentry"),n.set("value",t.file);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},set_image:function(t){t.preventDefault(),M.atto_image.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_image_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_altentry");var i=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_widthentry");var s=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_heightentry");var o=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_image.selection);var u='+')
"+''+'"+''+'"+''+"
"+'"+''+'"+''+"
"+'"+"
"+'"+""+"
"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"))}r.show()}};M.editor_atto.add_toolbar_button(t.elementid,"image",t.icon,t.group,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url),n=e.one("#atto_image_altentry"),n.set("value",t.file);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},set_image:function(t){t.preventDefault(),M.atto_image.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_image_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_altentry");var i=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_widthentry");var s=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_heightentry");var o=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_image.selection);var u='"+''+'"+''+'"+''+"
"+'"+''+'"+''+"
"+'"+"
"+'"+""+"
"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js index 2658d79173d..d8c624d88f3 100644 --- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js +++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js @@ -87,7 +87,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js index ee7989b7ecd..791d2242aea 100644 --- a/lib/editor/atto/plugins/image/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/image/yui/src/button/js/button.js @@ -85,7 +85,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/indent/lib.php b/lib/editor/atto/plugins/indent/lib.php index eb31579626d..52c58d2b555 100644 --- a/lib/editor/atto/plugins/indent/lib.php +++ b/lib/editor/atto/plugins/indent/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_indent_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('indent', + $icon = $OUTPUT->pix_icon('e/increase_indent', get_string('indent', 'atto_indent'), - 'atto_indent', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_indent-button', 'M.atto_indent.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_indent_sort_order() { return 5; diff --git a/lib/editor/atto/plugins/indent/pix/indent.png b/lib/editor/atto/plugins/indent/pix/indent.png deleted file mode 100644 index 227ddd68032..00000000000 Binary files a/lib/editor/atto/plugins/indent/pix/indent.png and /dev/null differ diff --git a/lib/editor/atto/plugins/indent/pix/indent.svg b/lib/editor/atto/plugins/indent/pix/indent.svg deleted file mode 100644 index 54ed187921a..00000000000 --- a/lib/editor/atto/plugins/indent/pix/indent.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js index 0a98a2b86d7..aa393bfe012 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js @@ -32,7 +32,7 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js index 3079b97f5da..6e10e44ee1b 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js index 0a98a2b86d7..aa393bfe012 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js @@ -32,7 +32,7 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js index 05593e3d12e..4e6ce3aa276 100644 --- a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/lib.php b/lib/editor/atto/plugins/italic/lib.php index fb12b861192..61993f16918 100644 --- a/lib/editor/atto/plugins/italic/lib.php +++ b/lib/editor/atto/plugins/italic/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_italic_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('italic', + $icon = $OUTPUT->pix_icon('e/italic', get_string('italic', 'atto_italic'), - 'atto_italic', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_italic-button', 'M.atto_italic.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_italic_sort_order() { return 1; diff --git a/lib/editor/atto/plugins/italic/pix/italic.png b/lib/editor/atto/plugins/italic/pix/italic.png deleted file mode 100644 index 0efebc23b3b..00000000000 Binary files a/lib/editor/atto/plugins/italic/pix/italic.png and /dev/null differ diff --git a/lib/editor/atto/plugins/italic/pix/italic.svg b/lib/editor/atto/plugins/italic/pix/italic.svg deleted file mode 100644 index 558e730f6ef..00000000000 --- a/lib/editor/atto/plugins/italic/pix/italic.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js index 78285fc89a1..78b18b25b6c 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js @@ -32,7 +32,7 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js index 568d6df8814..8e51967a5e5 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js index 78285fc89a1..78b18b25b6c 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js @@ -32,7 +32,7 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js index c22dcce318e..d7da568e8f7 100644 --- a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/link/lib.php b/lib/editor/atto/plugins/link/lib.php index 56067e7d230..90b953c66d7 100644 --- a/lib/editor/atto/plugins/link/lib.php +++ b/lib/editor/atto/plugins/link/lib.php @@ -31,9 +31,9 @@ defined('MOODLE_INTERNAL') || die(); function atto_link_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('link', + $icon = $OUTPUT->pix_icon('e/insert_edit_link', get_string('link', 'atto_link'), - 'atto_link', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createlink', @@ -44,14 +44,14 @@ function atto_link_init_editor($elementid) { $PAGE->requires->yui_module('moodle-atto_link-button', 'M.atto_link.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_link_sort_order() { return 11; diff --git a/lib/editor/atto/plugins/link/pix/link.png b/lib/editor/atto/plugins/link/pix/link.png deleted file mode 100644 index 5a0ac7f4a68..00000000000 Binary files a/lib/editor/atto/plugins/link/pix/link.png and /dev/null differ diff --git a/lib/editor/atto/plugins/link/pix/link.svg b/lib/editor/atto/plugins/link/pix/link.svg deleted file mode 100644 index 13bfc7c209b..00000000000 --- a/lib/editor/atto/plugins/link/pix/link.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js index c352f07b7fe..69cc68918ee 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js @@ -56,7 +56,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js index 64546785d78..68806afcb60 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,t,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r;if(!t)return;n=e.one(t).ancestor("a"),n&&(r=n.getAttribute("href"),r!==""&&(M.atto_link.selection=M.editor_atto.get_selection_from_node(n),e.one("#atto_link_urlentry").set("value",r)))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(e){e.preventDefault(),M.atto_link.dialogue.hide();var t=e.currentTarget.get("parentNode").one("input"),n=t.get("value");n!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,n))},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,e.group,t,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r;if(!t)return;n=e.one(t).ancestor("a"),n&&(r=n.getAttribute("href"),r!==""&&(M.atto_link.selection=M.editor_atto.get_selection_from_node(n),e.one("#atto_link_urlentry").set("value",r)))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(e){e.preventDefault(),M.atto_link.dialogue.hide();var t=e.currentTarget.get("parentNode").one("input"),n=t.get("value");n!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,n))},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js index c352f07b7fe..69cc68918ee 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js @@ -56,7 +56,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/link/yui/src/button/js/button.js b/lib/editor/atto/plugins/link/yui/src/button/js/button.js index b719e9a92b5..329e1f7b99e 100644 --- a/lib/editor/atto/plugins/link/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/link/yui/src/button/js/button.js @@ -54,7 +54,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/media/lib.php b/lib/editor/atto/plugins/media/lib.php index d0a4428191c..c38198b3390 100644 --- a/lib/editor/atto/plugins/media/lib.php +++ b/lib/editor/atto/plugins/media/lib.php @@ -29,9 +29,9 @@ function atto_media_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('media', + $icon = $OUTPUT->pix_icon('e/insert_edit_video', get_string('media', 'atto_media'), - 'atto_media', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createmedia', @@ -42,14 +42,14 @@ function atto_media_init_editor($elementid) { 'atto_media'); $PAGE->requires->yui_module('moodle-atto_media-button', 'M.atto_media.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'file')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_media_sort_order() { return 14; diff --git a/lib/editor/atto/plugins/media/pix/media.png b/lib/editor/atto/plugins/media/pix/media.png deleted file mode 100644 index 36b2828d1e8..00000000000 Binary files a/lib/editor/atto/plugins/media/pix/media.png and /dev/null differ diff --git a/lib/editor/atto/plugins/media/pix/media.svg b/lib/editor/atto/plugins/media/pix/media.svg deleted file mode 100644 index 4842828b9aa..00000000000 --- a/lib/editor/atto/plugins/media/pix/media.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js index 587b48280b1..e4fcc22e3f4 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js @@ -54,7 +54,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js index 207fa8fa358..5faab6eb045 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s=''+i+"";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s=''+i+"";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js index 587b48280b1..e4fcc22e3f4 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js @@ -54,7 +54,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/media/yui/src/button/js/button.js b/lib/editor/atto/plugins/media/yui/src/button/js/button.js index ccbbbb5c292..70fe607198f 100644 --- a/lib/editor/atto/plugins/media/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/media/yui/src/button/js/button.js @@ -52,7 +52,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/orderedlist/lib.php b/lib/editor/atto/plugins/orderedlist/lib.php index 524202c1f2c..0fe7d650b53 100644 --- a/lib/editor/atto/plugins/orderedlist/lib.php +++ b/lib/editor/atto/plugins/orderedlist/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_orderedlist_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('orderedlist', + $icon = $OUTPUT->pix_icon('e/numbered_list', get_string('orderedlist', 'atto_orderedlist'), - 'atto_orderedlist', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_orderedlist-button', 'M.atto_orderedlist.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return array groupname followed by the absolute position within the toolbar */ function atto_orderedlist_sort_order() { return 6; diff --git a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png b/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png deleted file mode 100644 index 33fbb630805..00000000000 Binary files a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png and /dev/null differ diff --git a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg b/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg deleted file mode 100644 index 1bf589a92c4..00000000000 --- a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js index c1a07064680..a2cc475acb3 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js @@ -32,7 +32,7 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js index d606ba09c67..d5cc7646679 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js index c1a07064680..a2cc475acb3 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js @@ -32,7 +32,7 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js index 8f549432b58..93a00c08597 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/lib.php b/lib/editor/atto/plugins/outdent/lib.php index 29cca4ce587..1383604d4e0 100644 --- a/lib/editor/atto/plugins/outdent/lib.php +++ b/lib/editor/atto/plugins/outdent/lib.php @@ -29,21 +29,21 @@ function atto_outdent_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('outdent', + $icon = $OUTPUT->pix_icon('e/decrease_indent', get_string('outdent', 'atto_outdent'), - 'atto_outdent', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_outdent-button', 'M.atto_outdent.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_outdent_sort_order() { return 4; diff --git a/lib/editor/atto/plugins/outdent/pix/outdent.png b/lib/editor/atto/plugins/outdent/pix/outdent.png deleted file mode 100644 index 2c708fa7b96..00000000000 Binary files a/lib/editor/atto/plugins/outdent/pix/outdent.png and /dev/null differ diff --git a/lib/editor/atto/plugins/outdent/pix/outdent.svg b/lib/editor/atto/plugins/outdent/pix/outdent.svg deleted file mode 100644 index 875d8708e38..00000000000 --- a/lib/editor/atto/plugins/outdent/pix/outdent.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js index cd8bd527ec6..c0a4827d4d1 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js @@ -32,7 +32,7 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js index 4d14a825599..16df6c46ae8 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js index cd8bd527ec6..c0a4827d4d1 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js @@ -32,7 +32,7 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js index 2f7eebc3f9e..96e8a9c0b67 100644 --- a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/lib.php b/lib/editor/atto/plugins/strike/lib.php index 000bb44d737..22e77966409 100644 --- a/lib/editor/atto/plugins/strike/lib.php +++ b/lib/editor/atto/plugins/strike/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_strike_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('strike', + $icon = $OUTPUT->pix_icon('e/strikethrough', get_string('strike', 'atto_strike'), - 'atto_strike', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_strike-button', 'M.atto_strike.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int absolute position within the toolbar */ function atto_strike_sort_order() { return 3; diff --git a/lib/editor/atto/plugins/strike/pix/strike.png b/lib/editor/atto/plugins/strike/pix/strike.png deleted file mode 100644 index c5c3a618209..00000000000 Binary files a/lib/editor/atto/plugins/strike/pix/strike.png and /dev/null differ diff --git a/lib/editor/atto/plugins/strike/pix/strike.svg b/lib/editor/atto/plugins/strike/pix/strike.svg deleted file mode 100644 index 214f25716d8..00000000000 --- a/lib/editor/atto/plugins/strike/pix/strike.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js index 34f2908e848..3807083bb86 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js @@ -32,7 +32,7 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js index d37fd84168a..873cb8c3c0d 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js index 34f2908e848..3807083bb86 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js @@ -32,7 +32,7 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js index 06b0629502d..c69ce0d1476 100644 --- a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/title/lib.php b/lib/editor/atto/plugins/title/lib.php index 6f40550c7d8..ae81ffd9d18 100644 --- a/lib/editor/atto/plugins/title/lib.php +++ b/lib/editor/atto/plugins/title/lib.php @@ -31,9 +31,13 @@ defined('MOODLE_INTERNAL') || die(); function atto_title_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('title', + $icon = $OUTPUT->pix_icon('e/styleprops', get_string('title', 'atto_title'), - 'atto_title', + 'moodle', + array('class'=>'icon')); + $icon .= $OUTPUT->pix_icon('t/expanded', + get_string('title', 'atto_title'), + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('h3', @@ -44,14 +48,14 @@ function atto_title_init_editor($elementid) { 'p'), 'atto_title'); $PAGE->requires->yui_module('moodle-atto_title-button', 'M.atto_title.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'title')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_title_sort_order() { return 9; diff --git a/lib/editor/atto/plugins/title/pix/title.png b/lib/editor/atto/plugins/title/pix/title.png deleted file mode 100644 index 9a587fb1440..00000000000 Binary files a/lib/editor/atto/plugins/title/pix/title.png and /dev/null differ diff --git a/lib/editor/atto/plugins/title/pix/title.svg b/lib/editor/atto/plugins/title/pix/title.svg deleted file mode 100644 index 18f1b62ee87..00000000000 --- a/lib/editor/atto/plugins/title/pix/title.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js index 641b0e5e92f..1908ff6bb6c 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js @@ -53,6 +53,7 @@ M.atto_title = M.atto_title || { M.editor_atto.add_toolbar_menu(params.elementid, 'title', params.icon, + params.group, [ {'text' : h3, 'handler' : click_h3}, {'text' : h4, 'handler' : click_h4}, diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js index 2235d53c86e..9dfde66a4df 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"")},n=function(e,t){M.atto_title.change_title(e,t,"
');
+ toolbar.append(group);
+ }
+ button = Y.Node.create('');
- toolbar.append(button);
+ group.append(button);
+
+ currentfocus = toolbar.getAttribute('aria-activedescendant');
+ if (!currentfocus) {
+ button.setAttribute('tabindex', '0');
+ toolbar.setAttribute('aria-activedescendant', button.generateID());
+ }
// Save the name of the plugin.
M.editor_atto.widgets[plugin] = plugin;
@@ -215,20 +231,36 @@ M.editor_atto = M.editor_atto || {
/**
* Add a button to the toolbar belonging to the editor for element with id "elementid".
* @param string elementid - the id of the textarea we created this editor from.
- * @param string plugin - the plugin defining the button
- * @param string icon - the html used for the content of the button
+ * @param string plugin - the plugin defining the button.
+ * @param string icon - the html used for the content of the button.
+ * @param string groupname - the group the button should be appended to.
* @handler function handler- A function to call when the button is clicked.
*/
- add_toolbar_button : function(elementid, plugin, icon, handler) {
- var toolbar = Y.one('#' + elementid + '_toolbar');
- var button = Y.Node.create('');
+ add_toolbar_button : function(elementid, plugin, icon, groupname, handler) {
+ var toolbar = Y.one('#' + elementid + '_toolbar'),
+ group = Y.one('#' + elementid + '_toolbar .atto_group.' + groupname + '_group'),
+ button,
+ currentfocus;
- toolbar.append(button);
+ if (!group) {
+ group = Y.Node.create('');
+ toolbar.append(group);
+ }
+ button = Y.Node.create('');
+
+ group.append(button);
+
+ currentfocus = toolbar.getAttribute('aria-activedescendant');
+ if (!currentfocus) {
+ button.setAttribute('tabindex', '0');
+ toolbar.setAttribute('aria-activedescendant', button.generateID());
+ }
// We only need to attach this once.
if (!M.editor_atto.buttonhandlers[plugin]) {
@@ -282,7 +314,7 @@ M.editor_atto = M.editor_atto || {
'spellcheck="true" ' +
'class="editor_atto"/>');
var cssfont = '';
- var toolbar = Y.Node.create('');
+ var toolbar = Y.Node.create('');
// Bleh - why are we sent a url and not the css to apply directly?
var css = Y.io(params.content_css, { sync: true });
@@ -311,10 +343,61 @@ M.editor_atto = M.editor_atto || {
textarea.set('value', atto.getHTML());
});
+ // Listen for Arrow left and Arrow right keys.
+ Y.one(Y.config.doc.body).delegate('key',
+ this.keyboard_navigation,
+ 'down:37,39',
+ '#' + params.elementid + '_toolbar',
+ this,
+ params.elementid);
+
// Save the file picker options for later.
M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
},
+ /**
+ * Implement arrow key navigation for the buttons in the toolbar.
+ * @param Event e - the keyboard event.
+ * @param string elementid - the id of the textarea we created this editor from.
+ */
+ keyboard_navigation : function(e, elementid) {
+ var buttons,
+ current,
+ currentid,
+ currentindex;
+
+ e.preventDefault();
+
+ buttons = Y.all('#' + elementid + '_toolbar button');
+ currentid = Y.one('#' + elementid + '_toolbar').getAttribute('aria-activedescendant');
+ if (!currentid) {
+ return;
+ }
+ current = Y.one('#' + currentid);
+ current.setAttribute('tabindex', '-1');
+
+ currentindex = buttons.indexOf(current);
+
+ if (e.keyCode === 37) {
+ // Left
+ currentindex--;
+ if (currentindex < 0) {
+ currentindex = buttons.size()-1;
+ }
+ } else {
+ // Right
+ currentindex++;
+ if (currentindex >= buttons.size()) {
+ currentindex = 0;
+ }
+ }
+
+ current = buttons.item(currentindex);
+ current.setAttribute('tabindex', '0');
+ current.focus();
+ Y.one('#' + elementid + '_toolbar').setAttribute('aria-activedescendant', current.generateID());
+ },
+
/**
* Show the filepicker.
* @param string elementid for this editor instance.
@@ -420,4 +503,4 @@ M.editor_atto = M.editor_atto || {
};
-}, '@VERSION@', {"requires": ["node", "io", "overlay", "escape", "moodle-core-notification"]});
+}, '@VERSION@', {"requires": ["node", "io", "overlay", "escape", "event-key", "moodle-core-notification"]});
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index 87290812b44..21a2acec687 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
@@ -1 +1,2 @@
-YUI.add("moodle-editor_atto-editor",function(e,t){M.editor_atto=M.editor_atto||{buttonhandlers:{},menus:{},menuhandlers:{},filepickeroptions:{},widgets:{},showhide_menu_handler:function(e){e.preventDefault();var t=this.getAttribute("disabled"),n=this.getAttribute("data-menu"),r=M.editor_atto.menus[n],i=r.get("bodyContent");r.get("visible")||t?(r.hide(),i.detach("clickoutside")):(i.on("clickoutside",function(e){e.target.ancestor()!==this&&e.target!==this&&r.get("visible")&&(i.detach("clickoutside"),r.hide())},this),r.show())},buttonclicked_handler:function(e){var t=this.getAttribute("data-editor"),n=this.getAttribute("data-plugin"),r=this.getAttribute("data-handler"),i=M.editor_atto.menus[n+"_"+t];i&&i.hide();if(M.editor_atto.is_enabled(t,n))return r=M.editor_atto.buttonhandlers[r],r(e,t)},is_enabled:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");return!r.hasAttribute("disabled")},disable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.setAttribute("disabled","true")},enable_widget:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");r&&r.removeAttribute("disabled")},enable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.removeAttribute("disabled")},add_toolbar_menu:function(t,n,r,i){var s=e.one("#"+t+"_toolbar"),o=e.Node.create('");s.append(o),M.editor_atto.widgets[n]=n;var u=e.Node.create(''),a=0,f={};for(a=0;a' + html + '
');
+ modlist.appendChild(modlinks);
+ initlinks(modlinks, mod);
+ }
+
+ // Toggles the display of the hidden module select all/none links.
+ var toggletypes = function() {
+ // Change text of type toggle link.
+ var link = Y.one('#backup-bytype');
+ if (modlist.currentlyshown) {
+ link.setHTML(M.util.get_string('showtypes', 'backup'));
+ } else {
+ link.setHTML(M.util.get_string('hidetypes', 'backup'));
+ }
+
+ // The link has now been toggled (from show to hide, or vice-versa).
+ modlist.currentlyshown = !modlist.currentlyshown;
+
+ // Either hide or show the links.
+ var animcfg = { node: modlist, duration: 0.2 };
+ if (modlist.currentlyshown) {
+ // Animate reveal of the module links.
+ modlist.show();
+ animcfg.to = { maxHeight: modlist.get('clientHeight') + 'px' };
+ modlist.setStyle('maxHeight', '0px');
+ var anim = new Y.Anim(animcfg);
+ anim.on('end', function() { modlist.setStyle('maxHeight', 'none'); });
+ anim.run();
+ } else {
+ // Animate hide of the module links.
+ animcfg.to = { maxHeight: '0px' };
+ modlist.setStyle('maxHeight', modlist.get('clientHeight') + 'px');
+ var anim = new Y.Anim(animcfg);
+ anim.on('end', function() { modlist.hide(); modlist.setStyle('maxHeight', 'none'); });
+ anim.run();
+ }
+
+ };
+ Y.one('#backup-bytype').on('click', function(e) { toggletypes(); });
+
Y.one('#backup-all-included').on('click', function(e) { helper(e, true, '_included'); });
Y.one('#backup-none-included').on('click', function(e) { helper(e, false, '_included'); });
if (withuserdata) {
@@ -77,4 +156,4 @@ M.core_backup.select_all_init = function(str) {
}
}
-}, '@VERSION@', {'requires':['base','node','event', 'node-event-simulate']});
+}, '@VERSION@', {'requires':['base', 'node', 'event', 'node-event-simulate', 'anim']});
diff --git a/backup/util/xml/parser/progressive_parser.class.php b/backup/util/xml/parser/progressive_parser.class.php
index d465aba9d42..882852af211 100644
--- a/backup/util/xml/parser/progressive_parser.class.php
+++ b/backup/util/xml/parser/progressive_parser.class.php
@@ -67,6 +67,11 @@ class progressive_parser {
protected $prevlevel; // level of the previous tag processed - to detect pushing places
protected $currtag; // name/value/attributes of the tag being processed
+ /**
+ * @var core_backup_progress Progress tracker called for each action
+ */
+ protected $progress;
+
public function __construct($case_folding = false) {
$this->xml_parser = xml_parser_create('UTF-8');
xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, $case_folding);
@@ -118,6 +123,18 @@ class progressive_parser {
$this->processor = $processor;
}
+ /**
+ * Sets the progress tracker for the parser. If set, the tracker will be
+ * called to report indeterminate progress for each chunk of XML.
+ *
+ * The caller should have already called start_progress on the progress tracker.
+ *
+ * @param core_backup_progress $progress Progress tracker
+ */
+ public function set_progress(core_backup_progress $progress) {
+ $this->progress = $progress;
+ }
+
/*
* Process the XML, delegating found chunks to the @progressive_parser_processor
*/
@@ -167,6 +184,10 @@ class progressive_parser {
protected function publish($data) {
$this->processor->receive_chunk($data);
+ if (!empty($this->progress)) {
+ // Report indeterminate progress.
+ $this->progress->progress();
+ }
}
/**
diff --git a/badges/action.php b/badges/action.php
index f6f9524fa9a..66c2b3b8afe 100644
--- a/badges/action.php
+++ b/badges/action.php
@@ -110,6 +110,7 @@ if ($activate) {
if ($confirm == 1) {
require_sesskey();
$badge->set_status($status);
+ $returnurl->param('msg', 'activatesuccess');
if ($badge->type == BADGE_TYPE_SITE) {
// Review on cron if there are more than 1000 users who can earn a site-level badge.
diff --git a/badges/ajax.php b/badges/ajax.php
index 76e8c26581b..29c1f1d6b18 100644
--- a/badges/ajax.php
+++ b/badges/ajax.php
@@ -34,7 +34,7 @@ $PAGE->set_url('/badges/ajax.php');
$PAGE->set_context(context_system::instance());
// Unlock session during potentially long curl request.
-session_get_instance()->write_close();
+\core\session\manager::write_close();
$result = badges_check_backpack_accessibility();
diff --git a/badges/backpack.js b/badges/backpack.js
index 98678e8f29e..d20ad17d6f3 100644
--- a/badges/backpack.js
+++ b/badges/backpack.js
@@ -43,4 +43,87 @@ function check_site_access() {
});
return false;
-}
\ No newline at end of file
+}
+
+/*
+ * Update the status indicator to show connection progress.
+ */
+function badges_set_connection_progress(status) {
+ switch (status) {
+ case 'connecting':
+ var connecting = M.util.get_string('connecting', 'badges');
+ var imageurl = M.util.image_url('i/loading_small', 'moodle');
+ var loading = Y.Node.create(connecting + ' Courses can be created automatically if there are enrolments to a course that doesn\'t yet exist in Moodle
If you are using automatic course creation, it is recommended that you remove the following capabilities: moodle/course:changeidnumber, moodle/course:changeshortname, moodle/course:changefullname and moodle/course:changesummary, from the relevant roles to prevent modifications of the four course fields specified above (ID number, shortname, fullname and summary).
'; $string['autocreate_key'] = 'Auto create'; $string['autocreation_settings'] = 'Automatic course creation settings'; +$string['autoupdate_settings'] = 'Automatic course update settings'; +$string['autoupdate_settings_desc'] = 'Select fields to update when synchronization script is running (enrol/ldap/cli/sync.php).
When at least one field is selected an update will occur.
'; $string['bind_dn'] = 'If you want to use a bind user to search users, specify it here. Someting like \'cn=ldapuser,ou=public,o=org\''; $string['bind_dn_key'] = 'Bind user distinguished name'; $string['bind_pw'] = 'Password for the bind user'; $string['bind_pw_key'] = 'Password'; $string['bind_settings'] = 'Bind settings'; $string['cannotcreatecourse'] = 'Cannot create course: missing required data from the LDAP record!'; +$string['cannotupdatecourse'] = "Cannot update course: missing required data from the LDAP record! Course idnumber: '{\$a->idnumber}'"; +$string['cannotupdatecourse_duplicateshortname'] = "Cannot update course: Duplicate short name. Skipping course with idnumber '{\$a->idnumber}'..."; +$string['courseupdated'] = "Course with idnumber '{\$a->idnumber}' was successfully updated."; +$string['courseupdateskipped'] = "Course with idnumber '{\$a->idnumber}' does not require updating. Skipping..."; $string['category'] = 'The category for auto-created courses'; $string['category_key'] = 'Category'; $string['contexts'] = 'LDAP contexts'; @@ -41,6 +47,8 @@ $string['couldnotfinduser'] = "Could not find user '{\$a}', skipping\n"; $string['coursenotexistskip'] = "Course '{\$a}' does not exist and autocreation disabled, skipping\n"; $string['course_fullname'] = 'Optional: LDAP attribute to get the full name from'; $string['course_fullname_key'] = 'Full name'; +$string['course_fullname_updateonsync'] = 'Update full name during synchronization script'; +$string['course_fullname_updateonsync_key'] = 'Update full name'; $string['course_idnumber'] = 'LDAP attribute to get the course ID number from. Usually \'cn\' or \'uid\'.'; $string['course_idnumber_key'] = 'ID number'; $string['course_search_sub'] = 'Search group memberships from subcontexts'; @@ -48,8 +56,12 @@ $string['course_search_sub_key'] = 'Search subcontexts'; $string['course_settings'] = 'Course enrolment settings'; $string['course_shortname'] = 'Optional: LDAP attribute to get the shortname from'; $string['course_shortname_key'] = 'Short name'; +$string['course_shortname_updateonsync'] = 'Update short name during synchronization script'; +$string['course_shortname_updateonsync_key'] = 'Update short name'; $string['course_summary'] = 'Optional: LDAP attribute to get the summary from'; $string['course_summary_key'] = 'Summary'; +$string['course_summary_updateonsync'] = 'Update summary during synchronization script'; +$string['course_summary_updateonsync_key'] = 'Update summary'; $string['createcourseextid'] = 'CREATE User enrolled to a nonexistant course \'{$a->courseextid}\''; $string['createnotcourseextid'] = 'User enrolled to a nonexistant course \'{$a->courseextid}\''; $string['creatingcourse'] = 'Creating course \'{$a}\'...'; diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php index f37e12ac8fb..fa84fe36f8b 100644 --- a/enrol/ldap/lib.php +++ b/enrol/ldap/lib.php @@ -430,6 +430,8 @@ class enrol_ldap_plugin extends enrol_plugin { $trace->output(get_string('createnotcourseextid', 'enrol_ldap', array('courseextid'=>$idnumber))); continue; // Next; skip this one! } + } else { // Check if course needs update & update as needed. + $this->update_course($course_obj, $course, $trace); } // Enrol & unenrol @@ -1000,6 +1002,78 @@ class enrol_ldap_plugin extends enrol_plugin { return $newcourse->id; } + /** + * Will update a moodle course with new values from LDAP + * A field will be updated only if it is marked to be updated + * on sync in plugin settings + * + * @param object $course + * @param array $externalcourse + * @param progress_trace $trace + * @return bool + */ + protected function update_course($course, $externalcourse, progress_trace $trace) { + global $CFG, $DB; + + $coursefields = array ('shortname', 'fullname', 'summary'); + static $shouldupdate; + + // Initialize $shouldupdate variable. Set to true if one or more fields are marked for update. + if (!isset($shouldupdate)) { + $shouldupdate = false; + foreach ($coursefields as $field) { + $shouldupdate = $shouldupdate || $this->get_config('course_'.$field.'_updateonsync'); + } + } + + // If we should not update return immediately. + if (!$shouldupdate) { + return false; + } + + require_once("$CFG->dirroot/course/lib.php"); + $courseupdated = false; + $updatedcourse = new stdClass(); + $updatedcourse->id = $course->id; + + // Update course fields if necessary. + foreach ($coursefields as $field) { + // If field is marked to be updated on sync && field data was changed update it. + if ($this->get_config('course_'.$field.'_updateonsync') + && isset($externalcourse[$this->get_config('course_'.$field)][0]) + && $course->{$field} != $externalcourse[$this->get_config('course_'.$field)][0]) { + $updatedcourse->{$field} = $externalcourse[$this->get_config('course_'.$field)][0]; + $courseupdated = true; + } + } + + if (!$courseupdated) { + $trace->output(get_string('courseupdateskipped', 'enrol_ldap', $course)); + return false; + } + + // Do not allow empty fullname or shortname. + if ((isset($updatedcourse->fullname) && empty($updatedcourse->fullname)) + || (isset($updatedcourse->shortname) && empty($updatedcourse->shortname))) { + // We are in trouble! + $trace->output(get_string('cannotupdatecourse', 'enrol_ldap', $course)); + return false; + } + + // Check if the shortname already exists if it does - skip course updating. + if (isset($updatedcourse->shortname) + && $DB->record_exists('course', array('shortname' => $updatedcourse->shortname))) { + $trace->output(get_string('cannotupdatecourse_duplicateshortname', 'enrol_ldap', $course)); + return false; + } + + // Finally - update course in DB. + update_course($updatedcourse); + $trace->output(get_string('courseupdated', 'enrol_ldap', $course)); + + return true; + } + /** * Automatic enrol sync executed during restore. * Useful for automatic sync by course->idnumber or course category. diff --git a/enrol/ldap/settings.php b/enrol/ldap/settings.php index a0838622932..8b3f329a382 100644 --- a/enrol/ldap/settings.php +++ b/enrol/ldap/settings.php @@ -76,10 +76,13 @@ if ($ADMIN->fulltree) { //--- course mapping settings --- $settings->add(new admin_setting_heading('enrol_ldap_course_settings', get_string('course_settings', 'enrol_ldap'), '')); $settings->add(new admin_setting_configtext_trim_lower('enrol_ldap/objectclass', get_string('objectclass_key', 'enrol_ldap'), get_string('objectclass', 'enrol_ldap'), '')); - $coursefields = array ('idnumber', 'shortname', 'fullname', 'summary'); + $settings->add(new admin_setting_configtext_trim_lower('enrol_ldap/course_idnumber', get_string('course_idnumber_key', 'enrol_ldap'), get_string('course_idnumber', 'enrol_ldap'), '', true, true)); + + $coursefields = array ('shortname', 'fullname', 'summary'); foreach ($coursefields as $field) { $settings->add(new admin_setting_configtext_trim_lower('enrol_ldap/course_'.$field, get_string('course_'.$field.'_key', 'enrol_ldap'), get_string('course_'.$field, 'enrol_ldap'), '', true, true)); } + $settings->add(new admin_setting_configcheckbox('enrol_ldap/ignorehiddencourses', get_string('ignorehiddencourses', 'enrol_database'), get_string('ignorehiddencourses_desc', 'enrol_database'), 0)); $options = array(ENROL_EXT_REMOVED_UNENROL => get_string('extremovedunenrol', 'enrol'), ENROL_EXT_REMOVED_KEEP => get_string('extremovedkeep', 'enrol'), @@ -97,6 +100,13 @@ if ($ADMIN->fulltree) { } $settings->add(new admin_setting_configtext_trim_lower('enrol_ldap/template', get_string('template_key', 'enrol_ldap'), get_string('template', 'enrol_ldap'), '')); + //--- course update settings --- + $settings->add(new admin_setting_heading('enrol_ldap_autoupdate_settings', get_string('autoupdate_settings', 'enrol_ldap'), get_string('autoupdate_settings_desc', 'enrol_ldap'))); + $options = $yesno; + foreach ($coursefields as $field) { + $settings->add(new admin_setting_configselect('enrol_ldap/course_'.$field.'_updateonsync', get_string('course_'.$field.'_updateonsync_key', 'enrol_ldap'), get_string('course_'.$field.'_updateonsync', 'enrol_ldap'), 0, $options)); + } + //--- nested groups settings --- $settings->add(new admin_setting_heading('enrol_ldap_nested_groups_settings', get_string('nested_groups_settings', 'enrol_ldap'), '')); $options = $yesno; diff --git a/file.php b/file.php index fce3f788ec1..bfbe8701961 100644 --- a/file.php +++ b/file.php @@ -111,7 +111,7 @@ if ($file->get_filename() == '.') { // ======================================== // finally send the file // ======================================== -session_get_instance()->write_close(); // unlock session during fileserving +\core\session\manager::write_close(); // Unlock session during file serving. send_stored_file($file, $lifetime, $CFG->filteruploadedfiles, $forcedownload); diff --git a/filter/manage.php b/filter/manage.php index 49d80ce1c27..15b493cde35 100644 --- a/filter/manage.php +++ b/filter/manage.php @@ -25,6 +25,7 @@ require_once(dirname(__FILE__) . '/../config.php'); require_once($CFG->libdir . '/adminlib.php'); +require_once($CFG->libdir . '/pluginlib.php'); $contextid = required_param('contextid',PARAM_INT); $forfilter = optional_param('filter', '', PARAM_SAFEDIR); @@ -36,9 +37,6 @@ require_login($course, false, $cm); require_capability('moodle/filter:manage', $context); $PAGE->set_context($context); -// Purge all caches related to filter administration. -cache::make('core', 'plugininfo_filter')->purge(); - $args = array('contextid'=>$contextid); $baseurl = new moodle_url('/filter/manage.php', $args); if (!empty($forfilter)) { diff --git a/install.php b/install.php index 899ebd35e38..0c250a05f30 100644 --- a/install.php +++ b/install.php @@ -161,6 +161,7 @@ if (!empty($_POST)) { } // Fake some settings so that we can use selected functions from moodlelib.php, weblib.php and filelib.php. +global $CFG; $CFG = new stdClass(); $CFG->lang = $config->lang; $CFG->dirroot = dirname(__FILE__); @@ -221,20 +222,36 @@ ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include //point zend include path to moodles lib/zend so that includes and requires will search there for files before anywhere else ini_set('include_path', $CFG->libdir.'/zend' . PATH_SEPARATOR . ini_get('include_path')); +// Register our classloader, in theory somebody might want to replace it to load other hacked core classes. +// Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes. +if (defined('COMPONENT_CLASSLOADER')) { + spl_autoload_register(COMPONENT_CLASSLOADER); +} else { + spl_autoload_register('core_component::classloader'); +} + require('version.php'); $CFG->target_release = $release; -$SESSION = new stdClass(); -$SESSION->lang = $CFG->lang; +$_SESSION = array(); +$_SESSION['SESSION'] = new stdClass(); +$_SESSION['SESSION']->lang = $CFG->lang; +$_SESSION['USER'] = new stdClass(); +$_SESSION['USER']->id = 0; +$_SESSION['USER']->mnethostid = 1; -$USER = new stdClass(); -$USER->id = 0; +global $SESSION; +global $USER; +$SESSION = &$_SESSION['SESSION']; +$USER = &$_SESSION['USER']; +global $COURSE; $COURSE = new stdClass(); -$COURSE->id = 0; +$COURSE->id = 1; +global $SITE; $SITE = $COURSE; -define('SITEID', 0); +define('SITEID', 1); $hint_dataroot = ''; $hint_admindir = ''; diff --git a/lang/en/admin.php b/lang/en/admin.php index 235a81c93b9..71a73d89c36 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -424,13 +424,9 @@ $string['defaulthomepage'] = 'Default home page for users'; $string['defaultrequestcategory'] = 'Default category for course requests'; $string['defaultsettinginfo'] = 'Default: {$a}'; $string['defaultuserroleid'] = 'Default role for all users'; -$string['deletefilterareyousure'] = 'Are you sure you want to delete the filter \'{$a}\''; -$string['deletefilterareyousuremessage'] = 'You are about to completely delete the filter \'{$a}\'. Are you sure you want to uninstall it?'; -$string['deletefilterfiles'] = 'All data associated with the filter \'{$a->filter}\' has been deleted from the database. To complete the deletion (and to prevent the filter from re-installing itself), you should now delete this directory from your server: {$a->directory}'; $string['deleteincompleteusers'] = 'Delete incomplete users after'; $string['deleteunconfirmed'] = 'Delete not fully setup users after'; $string['deleteuser'] = 'Delete user'; -$string['deletingfilter'] = 'Deleting filter \'{$a}\''; $string['density'] = 'Density'; $string['denyemailaddresses'] = 'Denied email domains'; $string['development'] = 'Development'; @@ -1014,6 +1010,7 @@ $string['tablenosave'] = 'Changes in table above are saved automatically.'; $string['tablesnosave'] = 'Changes in tables above are saved automatically.'; $string['tabselectedtofront'] = 'On tables with tabs, should the row with the currently selected tab be placed at the front'; $string['tabselectedtofronttext'] = 'Bring selected tab row to front'; +$string['testsiteupgradewarning'] = 'You are currently using the {$a} test site, to upgrade it properly use the command line interface tool'; $string['themedesignermode'] = 'Theme designer mode'; $string['themelist'] = 'Theme list'; $string['themenoselected'] = 'No theme selected'; diff --git a/lang/en/backup.php b/lang/en/backup.php index d2de209bbd0..1a092c9cdcb 100644 --- a/lang/en/backup.php +++ b/lang/en/backup.php @@ -140,6 +140,7 @@ $string['generalroleassignments'] = 'Include role assignments'; $string['generalsettings'] = 'General backup settings'; $string['generaluserscompletion'] = 'Include user completion information'; $string['generalusers'] = 'Include users'; +$string['hidetypes'] = 'Hide type options'; $string['importgeneralsettings'] = 'General import defaults'; $string['importgeneralmaxresults'] = 'Maximum number of courses listed for import'; $string['importgeneralmaxresults_desc'] = 'This controls the number of courses that are listed during the first step of the import process'; @@ -174,6 +175,8 @@ $string['nomatchingcourses'] = 'There are no courses to display'; $string['norestoreoptions'] = 'There are no categories or existing courses you can restore to.'; $string['originalwwwroot'] = 'URL of backup'; $string['previousstage'] = 'Previous'; +$string['preparingui'] = 'Preparing to display page'; +$string['preparingdata'] = 'Preparing data'; $string['qcategory2coursefallback'] = 'The questions category "{$a->name}", originally at system/course category context in backup file, will be created at course context by restore'; $string['qcategorycannotberestored'] = 'The questions category "{$a->name}" cannot be created by restore'; $string['question2coursefallback'] = 'The questions category "{$a->name}", originally at system/course category context in backup file, will be created at course context by restore'; @@ -244,6 +247,7 @@ $string['setting_course_shortname'] = 'Course short name'; $string['setting_course_startdate'] = 'Course start date'; $string['setting_keep_roles_and_enrolments'] = 'Keep current roles and enrolments'; $string['setting_keep_groups_and_groupings'] = 'Keep current groups and groupings'; +$string['showtypes'] = 'Show type options'; $string['skiphidden'] = 'Skip hidden courses'; $string['skiphiddenhelp'] = 'Choose whether or not to skip hidden courses'; $string['skipmodifdays'] = 'Skip courses not modified since'; diff --git a/lang/en/badges.php b/lang/en/badges.php index 09cc67510ff..3065685c2d7 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -82,9 +82,11 @@ $string['backpackconnection_help'] = 'This page allows you to set up connection Currently, only Mozilla OpenBadges Backpack is supported. You need to sign up for a backpack service before trying to set up backpack connection on this page.'; $string['backpackdetails'] = 'Backpack settings'; $string['backpackemail'] = 'Email address'; -$string['backpackemail_help'] = 'Email address associated with your backpack. +$string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.'; +$string['personaconnection'] = 'Sign in with your email'; +$string['personaconnection_help'] = 'Persona is a system for identifying yourself across the web, using an email address that you own. The Open Badges backpack uses Persona as a login system, so to be able to connect to a backpack you with need a Persona account. -If backpack connection is established, this email address is used instead of your internal email address to push badges to your backpack.'; +For more information about Persona visit https://login.persona.org/about.'; $string['backpackimport'] = 'Badge import settings'; $string['backpackimport_help'] = 'After backpack connection is successfully established, badges from your backpack can be displayed on your "My Badges" page and your profile page. @@ -128,6 +130,7 @@ $string['configenablebadges'] = 'When enabled, this feature lets you create badg $string['configuremessage'] = 'Badge message'; $string['connect'] = 'Connect'; $string['connected'] = 'Connected'; +$string['connecting'] = 'Connecting...'; $string['contact'] = 'Contact'; $string['contact_help'] = 'An email address associated with the badge issuer.'; $string['copyof'] = 'Copy of {$a}'; @@ -139,6 +142,9 @@ $string['createbutton'] = 'Create badge'; $string['creatorbody'] = '{$a->user} has completed all badge requirements and has been awarded the badge. View issued badge at {$a->link}
'; $string['creatorsubject'] = '\'{$a}\' has been awarded!'; $string['criteriasummary'] = 'Criteria summary'; +$string['criteriacreated'] = 'Badge criteria successfully created'; +$string['criteriadeleted'] = 'Badge criteria successfully deleted'; +$string['criteriaupdated'] = 'Badge criteria successfully updated'; $string['criteria_descr'] = 'Users are awarded this badge when they complete the following requirement:'; $string['criteria_descr_bydate'] = ' by {$a} '; $string['criteria_descr_grade'] = ' with minimum grade of {$a} '; @@ -199,10 +205,15 @@ $string['disconnect'] = 'Disconnect'; $string['donotaward'] = 'Currently, this badge is not active, so it cannot be awarded to users. If you would like to award this badge, please set its status to active.'; $string['editsettings'] = 'Edit settings'; $string['enablebadges'] = 'Enable badges'; +$string['error:backpackdatainvalid'] = 'The data return from the backpack was invalid.'; +$string['error:backpackemailnotfound'] = 'The email \'{$a}\' is not associated with a backpack. You need to create a backpack for that account or sign in with another email address.'; $string['error:backpacknotavailable'] = 'Your site is not accessible from the Internet, so any badges issued from this site cannot be verified by external backpack services.'; +$string['error:backpackloginfailed'] = 'You could not be connected to an external backpack for the following reason: {$a}'; $string['error:backpackproblem'] = 'There was a problem connecting to your backpack service provider. Please try again later.'; +$string['error:badjson'] = 'The connection attempt returned invalid data.'; $string['error:cannotact'] = 'Cannot activate the badge. '; $string['error:cannotawardbadge'] = 'Cannot award badge to a user.'; +$string['error:connectionunknownreason'] = 'The connection was unsuccessful but no reason was given.'; $string['error:clone'] = 'Cannot clone the badge.'; $string['error:duplicatename'] = 'Badge with such name already exists in the system.'; $string['error:externalbadgedoesntexist'] = 'Badge not found'; @@ -211,6 +222,7 @@ $string['error:invalidcriteriatype'] = 'Invalid criteria type.'; $string['error:invalidexpiredate'] = 'Expiry date has to be in the future.'; $string['error:invalidexpireperiod'] = 'Expiry period cannot be negative or equal 0.'; $string['error:noactivities'] = 'There are no activities with completion criteria enabled in this course.'; +$string['error:noassertion'] = 'No assertion was returned by Persona. You may have closed the dialog before completing the login process.'; $string['error:nocourses'] = 'Course completion is not enabled for any of the courses in this site, so none can be displayed. Course completion may be enabled in the course settings.'; $string['error:nogroups'] = 'There are no public collections of badges available in your backpack.
Only public collections are shown, visit your backpack to create some public collections.
'; @@ -223,6 +235,9 @@ $string['error:nosuchrole'] = 'Warning: This role is no longer available.'; $string['error:nosuchuser'] = 'User with this email address does not have an account with the current backpack provider.'; $string['error:notifycoursedate'] = 'Warning: Badges associated with course and activity completions will not be issued until the course start date.'; $string['error:parameter'] = 'Warning: At least one parameter should be selected to ensure correct badge issuing workflow.'; +$string['error:personaneedsjs'] = 'Currently, Javascript is required to connect to your backpack. If you can, enable Javascript and reload the page.'; +$string['error:requesttimeout'] = 'The connection request timed out before it could complete.'; +$string['error:requesterror'] = 'The connection request failed (error code {$a}).'; $string['error:save'] = 'Cannot save the badge.'; $string['evidence'] = 'Evidence'; $string['existingrecipients'] = 'Existing badge recipients'; @@ -313,9 +328,14 @@ $string['recipientidentificationproblem'] = 'Cannot find a recipient of this bad $string['recipientvalidationproblem'] = 'Current user cannot be verified as a recipient of this badge.'; $string['relative'] = 'Relative date'; $string['requiredcourse'] = 'At least one course should be added to the courseset criterion.'; -$string['reviewbadge'] = 'Review badge criteria'; -$string['reviewconfirm'] = 'This action will perform a check if any of the users have already completed all the requirements for \'{$a}\' badge?
-Would you like to proceed?
'; +$string['reviewbadge'] = 'Changes in badge access'; +$string['reviewconfirm'] = 'This will make your badge visible to users and allow them to start earning it.
+ +It is possible that some users already meet this badge\'s criteria and will be issued this badge immediately after you enable it.
+ +Once a badge has been issued it will be locked - certain settings including the criteria and expiry settings can no longer be changed.
+ +Are you sure you want to enable access to the badge \'{$a}\'?
'; $string['save'] = 'Save'; $string['searchname'] = 'Search by name'; $string['selectaward'] = 'Please select the role you would like to use to award this badge: '; @@ -323,6 +343,7 @@ $string['selectgroup_end'] = 'Only public collections are shown, id from section $coursemod->section"); - } - } - } - - // Increment course.cacherev for courses that used this module. - // This will force cache rebuilding on the next request. - increment_revision_number('course', 'cacherev', - "id IN (SELECT DISTINCT course - FROM {course_modules} - WHERE module=?)", - array($module->id)); - - // delete all the course module records - $DB->delete_records('course_modules', array('module' => $module->id)); - - // delete module contexts - if ($coursemods) { - foreach ($coursemods as $coursemod) { - context_helper::delete_instance(CONTEXT_MODULE, $coursemod->id); - } - } - - // delete the module entry itself - $DB->delete_records('modules', array('name' => $module->name)); - - // cleanup the gradebook - require_once($CFG->libdir.'/gradelib.php'); - grade_uninstalled_module($module->name); - - // Perform any custom uninstall tasks - if (file_exists($CFG->dirroot . '/mod/' . $module->name . '/lib.php')) { - require_once($CFG->dirroot . '/mod/' . $module->name . '/lib.php'); - $uninstallfunction = $module->name . '_uninstall'; - if (function_exists($uninstallfunction)) { - debugging("{$uninstallfunction}() has been deprecated. Use the plugin's db/uninstall.php instead", DEBUG_DEVELOPER); - if (!$uninstallfunction()) { - echo $OUTPUT->notification('Encountered a problem running uninstall function for '. $module->name.'!'); - } - } - } - - } else if ($type === 'enrol') { - // NOTE: this is a bit brute force way - it will not trigger events and hooks properly - // nuke all role assignments - role_unassign_all(array('component'=>$component)); - // purge participants - $DB->delete_records_select('user_enrolments', "enrolid IN (SELECT id FROM {enrol} WHERE enrol = ?)", array($name)); - // purge enrol instances - $DB->delete_records('enrol', array('enrol'=>$name)); - // tweak enrol settings - if (!empty($CFG->enrol_plugins_enabled)) { - $enabledenrols = explode(',', $CFG->enrol_plugins_enabled); - $enabledenrols = array_unique($enabledenrols); - $enabledenrols = array_flip($enabledenrols); - unset($enabledenrols[$name]); - $enabledenrols = array_flip($enabledenrols); - if (is_array($enabledenrols)) { - set_config('enrol_plugins_enabled', implode(',', $enabledenrols)); - } - } - - } else if ($type === 'block') { - if ($block = $DB->get_record('block', array('name'=>$name))) { - // Inform block it's about to be deleted - if (file_exists("$CFG->dirroot/blocks/$block->name/block_$block->name.php")) { - $blockobject = block_instance($block->name); - if ($blockobject) { - $blockobject->before_delete(); //only if we can create instance, block might have been already removed - } - } - - // First delete instances and related contexts - $instances = $DB->get_records('block_instances', array('blockname' => $block->name)); - foreach($instances as $instance) { - blocks_delete_instance($instance); - } - - // Delete block - $DB->delete_records('block', array('id'=>$block->id)); - } - } else if ($type === 'format') { - if (($defaultformat = get_config('moodlecourse', 'format')) && $defaultformat !== $name) { - $courses = $DB->get_records('course', array('format' => $name), 'id'); - $data = (object)array('id' => null, 'format' => $defaultformat); - foreach ($courses as $record) { - $data->id = $record->id; - update_course($data); - } - } - $DB->delete_records('course_format_options', array('format' => $name)); + // Specific plugin type cleanup. + $plugininfo = plugin_manager::instance()->get_plugin_info($component); + if ($plugininfo) { + $plugininfo->uninstall_cleanup(); + plugin_manager::reset_caches(); } + $plugininfo = null; // perform clean-up task common for all the plugin/subplugin types @@ -298,16 +203,14 @@ function uninstall_plugin($type, $name) { $DB->delete_records('log_display', array('component' => $component)); // delete the module configuration records - unset_all_config_for_plugin($pluginname); + unset_all_config_for_plugin($component); + if ($type === 'mod') { + unset_all_config_for_plugin($pluginname); + } // delete message provider message_provider_uninstall($component); - // delete message processor - if ($type === 'message') { - message_processor_uninstall($name); - } - // delete the plugin tables $xmldbfilepath = $plugindirectory . '/db/install.xml'; drop_plugin_tables($component, $xmldbfilepath, false); @@ -369,15 +272,22 @@ function get_component_version($component, $source='installed') { // activity module if ($type === 'mod') { if ($source === 'installed') { - return $DB->get_field('modules', 'version', array('name'=>$name)); + if ($CFG->version < 2013092001.02) { + return $DB->get_field('modules', 'version', array('name'=>$name)); + } else { + return get_config('mod_'.$name, 'version'); + } + } else { $mods = core_component::get_plugin_list('mod'); if (empty($mods[$name]) or !is_readable($mods[$name].'/version.php')) { return false; } else { - $module = new stdclass(); + $plugin = new stdClass(); + $plugin->version = null; + $module = $plugin; include($mods[$name].'/version.php'); - return $module->version; + return $plugin->version; } } } @@ -6414,8 +6324,10 @@ function admin_get_root($reload=false, $requirefulltree=true) { */ function admin_apply_default_settings($node=NULL, $unconditional=true) { global $CFG; + require_once($CFG->libdir.'/pluginlib.php'); if (is_null($node)) { + plugin_manager::reset_caches(); $node = admin_get_root(true, true); } @@ -6440,6 +6352,8 @@ function admin_apply_default_settings($node=NULL, $unconditional=true) { $setting->write_setting_flags(null); } } + // Just in case somebody modifies the list of active plugins directly. + plugin_manager::reset_caches(); } /** diff --git a/lib/authlib.php b/lib/authlib.php index f8fac6ea501..736374214a2 100644 --- a/lib/authlib.php +++ b/lib/authlib.php @@ -618,9 +618,7 @@ function login_is_lockedout($user) { function login_attempt_valid($user) { global $CFG; - $event = \core\event\user_loggedin::create(array('objectid' => $user->id, 'other' => array('username' => $user->username))); - $event->add_record_snapshot('user', $user); - $event->trigger(); + // Note: user_loggedin event is triggered in complete_user_login(). if ($user->mnethostid != $CFG->mnet_localhost_id) { return; diff --git a/lib/classes/component.php b/lib/classes/component.php index 51db6e9f4ce..e193399b316 100644 --- a/lib/classes/component.php +++ b/lib/classes/component.php @@ -24,6 +24,20 @@ defined('MOODLE_INTERNAL') || die(); +// Constants used in version.php files, these must exist when core_component executes. + +/** Software maturity level - internals can be tested using white box techniques. */ +define('MATURITY_ALPHA', 50); +/** Software maturity level - feature complete, ready for preview and testing. */ +define('MATURITY_BETA', 100); +/** Software maturity level - tested, will be released unless there are fatal bugs. */ +define('MATURITY_RC', 150); +/** Software maturity level - ready for production deployment. */ +define('MATURITY_STABLE', 200); +/** Any version - special value that can be used in $plugin->dependencies in version.php files. */ +define('ANY_VERSION', 'any'); + + /** * Collection of components related methods. */ @@ -268,6 +282,7 @@ $cache = '.var_export($cache, true).'; protected static function fetch_core_version() { global $CFG; if (self::$version === null) { + $version = null; // Prevent IDE complaints. require($CFG->dirroot . '/version.php'); self::$version = $version; } @@ -912,17 +927,11 @@ $cache = '.var_export($cache, true).'; $plugs = self::fetch_plugins($type, $typedir); } foreach ($plugs as $plug => $fullplug) { - if ($type === 'mod') { - $module = new stdClass(); - $module->version = null; - include($fullplug.'/version.php'); - $versions[$type.'_'.$plug] = $module->version; - } else { - $plugin = new stdClass(); - $plugin->version = null; - @include($fullplug.'/version.php'); - $versions[$type.'_'.$plug] = $plugin->version; - } + $plugin = new stdClass(); + $plugin->version = null; + $module = $plugin; + @include($fullplug.'/version.php'); + $versions[$type.'_'.$plug] = $plugin->version; } } diff --git a/lib/classes/event/course_module_instances_list_viewed.php b/lib/classes/event/course_module_instances_list_viewed.php new file mode 100644 index 00000000000..b1b6db37b66 --- /dev/null +++ b/lib/classes/event/course_module_instances_list_viewed.php @@ -0,0 +1,81 @@ +. + +/** + * Course module instances list_viewed event. + * + * @package core + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace core\event; +defined('MOODLE_INTERNAL') || die(); + +/** + * Course module instances list viewed event class. + * + * This is an abstract to guide the developers in using this event name for their events. + * It is intended to be used when the user viewes the list of all the instances of a module + * in a course. This replaces the historical 'view all' log entry generated in mod/somemod/index.php. + * + * Example: + * + * \mod_chat\event\instances_list_viewed extends \core\event\course_module_instances_list_viewed + * + * @package core + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +abstract class course_module_instances_list_viewed extends \core\event\content_viewed { + + /** + * Init method. + * + * @return void + */ + protected function init() { + $this->data['crud'] = 'r'; + $this->data['level'] = self::LEVEL_OTHER; + } + + /** + * Set page detail. + * + * Override to prevent its use. + */ + public function set_page_detail() { + } + + /** + * Custom validation. + * + * The parent validation is ignored on purpose. + * + * @throws \coding_exception + * @return void + */ + protected function validate_data() { + if ($this->context->contextlevel !== CONTEXT_COURSE) { + throw new \coding_exception('The context must be a course level context.'); + } + // Hack to by pass the requirement of the parent class. 'view_all' was the old fashioned-way + // to describe the page listing all the instances of a module in a course. + $this->data['other']['content'] = 'view_all'; + parent::validate_data(); + } + +} diff --git a/lib/classes/event/course_reset_ended.php b/lib/classes/event/course_reset_ended.php new file mode 100644 index 00000000000..56e10091225 --- /dev/null +++ b/lib/classes/event/course_reset_ended.php @@ -0,0 +1,86 @@ +. + +/** + * core course reset ended event. + * + * @package core + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace core\event; +defined('MOODLE_INTERNAL') || die(); + +/** + * core course reset ended event class. + * + * @package core + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class course_reset_ended extends \core\event\base { + + /** + * Returns description of what happened. + * + * @return string + */ + public function get_description() { + return "The reset of course $this->courseid has ended."; + } + + /** + * Return localised event name. + * + * @return string + */ + public static function get_name() { + return get_string('eventcourseresetended', 'core'); + } + + /** + * Get URL related to the action + * + * @return \moodle_url + */ + public function get_url() { + return new \moodle_url('/course/view.php', array('id' => $this->courseid)); + } + + /** + * Init method. + * + * @return void + */ + protected function init() { + $this->data['crud'] = 'd'; + $this->data['level'] = self::LEVEL_OTHER; + } + + /** + * Custom validation. + * + * @throws \coding_exception + * @return void + */ + protected function validate_data() { + if (!isset($this->other['reset_options'])) { + throw new \coding_exception('The key reset_options must be set in $other.'); + } + } + +} diff --git a/lib/classes/event/course_reset_started.php b/lib/classes/event/course_reset_started.php new file mode 100644 index 00000000000..8a34a75e073 --- /dev/null +++ b/lib/classes/event/course_reset_started.php @@ -0,0 +1,86 @@ +. + +/** + * core course reset started event. + * + * @package core + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace core\event; +defined('MOODLE_INTERNAL') || die(); + +/** + * core course reset started event class. + * + * @package core + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class course_reset_started extends \core\event\base { + + /** + * Returns description of what happened. + * + * @return string + */ + public function get_description() { + return "The user $this->userid has started the reset of course $this->courseid."; + } + + /** + * Return localised event name. + * + * @return string + */ + public static function get_name() { + return get_string('eventcourseresetstarted', 'core'); + } + + /** + * Get URL related to the action + * + * @return \moodle_url + */ + public function get_url() { + return new \moodle_url('/course/view.php', array('id' => $this->courseid)); + } + + /** + * Init method. + * + * @return void + */ + protected function init() { + $this->data['crud'] = 'd'; + $this->data['level'] = self::LEVEL_OTHER; + } + + /** + * Custom validation. + * + * @throws \coding_exception + * @return void + */ + protected function validate_data() { + if (!isset($this->other['reset_options'])) { + throw new \coding_exception('The key reset_options must be set in $other.'); + } + } + +} diff --git a/lib/classes/event/user_loggedin.php b/lib/classes/event/user_loggedin.php index 006485f75f9..9065aa77363 100644 --- a/lib/classes/event/user_loggedin.php +++ b/lib/classes/event/user_loggedin.php @@ -96,7 +96,7 @@ class user_loggedin extends \core\event\base { /** * Custom validation. * - * @throws coding_exception when validation does not pass. + * @throws \coding_exception when validation does not pass. * @return void */ protected function validate_data() { diff --git a/lib/classes/event/user_loggedout.php b/lib/classes/event/user_loggedout.php index f881b471884..8f2c6aacfdd 100644 --- a/lib/classes/event/user_loggedout.php +++ b/lib/classes/event/user_loggedout.php @@ -38,6 +38,7 @@ class user_loggedout extends base { * Initialise required event data properties. */ protected function init() { + $this->context = \context_system::instance(); $this->data['objecttable'] = 'user'; $this->data['crud'] = 'r'; $this->data['level'] = self::LEVEL_OTHER; diff --git a/lib/classes/session/database.php b/lib/classes/session/database.php new file mode 100644 index 00000000000..4216980dff2 --- /dev/null +++ b/lib/classes/session/database.php @@ -0,0 +1,315 @@ +. + +/** + * Database based session handler. + * + * @package core + * @copyright 2013 Petr Skoda {@link http://skodak.org} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace core\session; + +defined('MOODLE_INTERNAL') || die(); + +/** + * Database based session handler. + * + * @package core + * @copyright 2013 Petr Skoda {@link http://skodak.org} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class database extends handler { + /** @var \stdClass $record session record */ + protected $recordid = null; + + /** @var \moodle_database $database session database */ + protected $database = null; + + /** @var bool $failed session read/init failed, do not write back to DB */ + protected $failed = false; + + /** @var string $lasthash hash of the session data content */ + protected $lasthash = null; + + /** @var int $acquiretimeout how long to wait for session lock */ + protected $acquiretimeout = 120; + + /** + * Create new instance of handler. + */ + public function __construct() { + global $DB, $CFG; + // Note: we store the reference here because we need to modify database in shutdown handler. + $this->database = $DB; + + if (!empty($CFG->session_database_acquire_lock_timeout)) { + $this->acquiretimeout = (int)$CFG->session_database_acquire_lock_timeout; + } + } + + /** + * Init session handler. + */ + public function init() { + if (!$this->database->session_lock_supported()) { + throw new exception('sessionhandlerproblem', 'error', '', null, 'Database does not support session locking'); + } + + $result = session_set_save_handler(array($this, 'handler_open'), + array($this, 'handler_close'), + array($this, 'handler_read'), + array($this, 'handler_write'), + array($this, 'handler_destroy'), + array($this, 'handler_gc')); + if (!$result) { + throw new exception('dbsessionhandlerproblem', 'error'); + } + + register_shutdown_function(array($this, 'handler_shutdown')); + } + + /** + * Check for existing session with id $sid. + * + * Note: this verifies the storage backend only, not the actual session records. + * + * @param string $sid + * @return bool true if session found. + */ + public function session_exists($sid) { + try { + return $this->database->record_exists('sessions', array('sid'=>$sid, 'state'=>0)); + } catch (\dml_exception $ex) { + return false; + } + } + + /** + * Kill all active sessions, the core sessions table is + * purged afterwards. + */ + public function kill_all_sessions() { + // Nothing to do, the sessions table is cleared from core. + return; + } + + /** + * Kill one session, the session record is removed afterwards. + * @param string $sid + */ + public function kill_session($sid) { + // Nothing to do, the sessions table is purged afterwards. + return; + } + + /** + * Open session handler. + * + * {@see http://php.net/manual/en/function.session-set-save-handler.php} + * + * @param string $save_path + * @param string $session_name + * @return bool success + */ + public function handler_open($save_path, $session_name) { + // Note: we use the already open database. + return true; + } + + /** + * Close session handler. + * + * {@see http://php.net/manual/en/function.session-set-save-handler.php} + * + * @return bool success + */ + public function handler_close() { + if ($this->recordid) { + try { + $this->database->release_session_lock($this->recordid); + } catch (\Exception $ex) { + // Ignore any problems. + } + } + $this->recordid = null; + $this->lasthash = null; + return true; + } + + /** + * Read session handler. + * + * {@see http://php.net/manual/en/function.session-set-save-handler.php} + * + * @param string $sid + * @return string + */ + public function handler_read($sid) { + try { + if (!$record = $this->database->get_record('sessions', array('sid'=>$sid), 'id')) { + // Let's cheat and skip locking if this is the first access, + // do not create the record here, let the manager do it after session init. + $this->failed = false; + $this->recordid = null; + $this->lasthash = sha1(''); + return ''; + } + if ($this->recordid and $this->recordid != $record->id) { + error_log('Second session read with different record id detected, cannot read session'); + $this->failed = true; + $this->recordid = null; + return ''; + } + if (!$this->recordid) { + // Lock session if exists and not already locked. + $this->database->get_session_lock($record->id, $this->acquiretimeout); + $this->recordid = $record->id; + } + } catch (\dml_sessionwait_exception $ex) { + // This is a fatal error, better inform users. + // It should not happen very often - all pages that need long time to execute + // should close session immediately after access control checks. + error_log('Cannot obtain session lock for sid: '.$sid); + $this->failed = true; + throw $ex; + + } catch (\Exception $ex) { + // Do not rethrow exceptions here, this should not happen. + error_log('Unknown exception when starting database session : '.$sid.' - '.$ex->getMessage()); + $this->failed = true; + $this->recordid = null; + return ''; + } + + // Finally read the full session data because we know we have the lock now. + if (!$record = $this->database->get_record('sessions', array('id'=>$record->id), 'id, sessdata')) { + // Ignore - something else just deleted the session record. + $this->failed = true; + $this->recordid = null; + return ''; + } + $this->failed = false; + + if (is_null($record->sessdata)) { + $data = ''; + $this->lasthash = sha1(''); + } else { + $data = base64_decode($record->sessdata); + $this->lasthash = sha1($record->sessdata); + } + + return $data; + } + + /** + * Write session handler. + * + * {@see http://php.net/manual/en/function.session-set-save-handler.php} + * + * NOTE: Do not write to output or throw any exceptions! + * Hopefully the next page is going to display nice error or it recovers... + * + * @param string $sid + * @param string $session_data + * @return bool success + */ + public function handler_write($sid, $session_data) { + if ($this->failed) { + // Do not write anything back - we failed to start the session properly. + return false; + } + + $sessdata = base64_encode($session_data); // There might be some binary mess :-( + $hash = sha1($sessdata); + + if ($hash === $this->lasthash) { + return true; + } + + try { + if ($this->recordid) { + $this->database->set_field('sessions', 'sessdata', $sessdata, array('id'=>$this->recordid)); + } else { + // This happens in the first request when session record was just created in manager. + $this->database->set_field('sessions', 'sessdata', $sessdata, array('sid'=>$sid)); + } + } catch (\Exception $ex) { + // Do not rethrow exceptions here, this should not happen. + error_log('Unknown exception when writing database session data : '.$sid.' - '.$ex->getMessage()); + } + + return true; + } + + /** + * Destroy session handler. + * + * {@see http://php.net/manual/en/function.session-set-save-handler.php} + * + * @param string $sid + * @return bool success + */ + public function handler_destroy($sid) { + if (!$session = $this->database->get_record('sessions', array('sid'=>$sid), 'id, sid')) { + if ($sid == session_id()) { + $this->recordid = null; + $this->lasthash = null; + } + return true; + } + + if ($this->recordid and $session->id == $this->recordid) { + try { + $this->database->release_session_lock($this->recordid); + } catch (\Exception $ex) { + // Ignore problems. + } + $this->recordid = null; + $this->lasthash = null; + } + + $this->database->delete_records('sessions', array('id'=>$session->id)); + + return true; + } + + /** + * GC session handler. + * + * {@see http://php.net/manual/en/function.session-set-save-handler.php} + * + * @param int $ignored_maxlifetime moodle uses special timeout rules + * @return bool success + */ + public function handler_gc($ignored_maxlifetime) { + // This should do something only if cron is not running properly... + if (!$stalelifetime = ini_get('session.gc_maxlifetime')) { + return true; + } + $params = array('purgebefore' => (time() - $stalelifetime)); + $this->database->delete_records_select('sessions', 'userid = 0 AND timemodified < :purgebefore', $params); + return true; + } + + /** + * This makes sure the session is written to disk at the end of request. + */ + public function handler_shutdown() { + $this->database->dispose(); + } +} diff --git a/admin/tool/generator/cli/generate.php b/lib/classes/session/exception.php similarity index 64% rename from admin/tool/generator/cli/generate.php rename to lib/classes/session/exception.php index 353883e1d30..ea58b0f5e8f 100644 --- a/admin/tool/generator/cli/generate.php +++ b/lib/classes/session/exception.php @@ -15,23 +15,20 @@ // along with Moodle. If not, see"+'"+''+'"+''+"
"+'"+"
"+'"+""+"
"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s
"+'"+''+'"+''+"
"+'"+"
"+'"+""+"
"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js index 2658d79173d..d8c624d88f3 100644 --- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js +++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js @@ -87,7 +87,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js index ee7989b7ecd..791d2242aea 100644 --- a/lib/editor/atto/plugins/image/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/image/yui/src/button/js/button.js @@ -85,7 +85,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/indent/lib.php b/lib/editor/atto/plugins/indent/lib.php index eb31579626d..52c58d2b555 100644 --- a/lib/editor/atto/plugins/indent/lib.php +++ b/lib/editor/atto/plugins/indent/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_indent_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('indent', + $icon = $OUTPUT->pix_icon('e/increase_indent', get_string('indent', 'atto_indent'), - 'atto_indent', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_indent-button', 'M.atto_indent.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_indent_sort_order() { return 5; diff --git a/lib/editor/atto/plugins/indent/pix/indent.png b/lib/editor/atto/plugins/indent/pix/indent.png deleted file mode 100644 index 227ddd68032..00000000000 Binary files a/lib/editor/atto/plugins/indent/pix/indent.png and /dev/null differ diff --git a/lib/editor/atto/plugins/indent/pix/indent.svg b/lib/editor/atto/plugins/indent/pix/indent.svg deleted file mode 100644 index 54ed187921a..00000000000 --- a/lib/editor/atto/plugins/indent/pix/indent.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js index 0a98a2b86d7..aa393bfe012 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js @@ -32,7 +32,7 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js index 3079b97f5da..6e10e44ee1b 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js index 0a98a2b86d7..aa393bfe012 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js @@ -32,7 +32,7 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js index 05593e3d12e..4e6ce3aa276 100644 --- a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/lib.php b/lib/editor/atto/plugins/italic/lib.php index fb12b861192..61993f16918 100644 --- a/lib/editor/atto/plugins/italic/lib.php +++ b/lib/editor/atto/plugins/italic/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_italic_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('italic', + $icon = $OUTPUT->pix_icon('e/italic', get_string('italic', 'atto_italic'), - 'atto_italic', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_italic-button', 'M.atto_italic.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_italic_sort_order() { return 1; diff --git a/lib/editor/atto/plugins/italic/pix/italic.png b/lib/editor/atto/plugins/italic/pix/italic.png deleted file mode 100644 index 0efebc23b3b..00000000000 Binary files a/lib/editor/atto/plugins/italic/pix/italic.png and /dev/null differ diff --git a/lib/editor/atto/plugins/italic/pix/italic.svg b/lib/editor/atto/plugins/italic/pix/italic.svg deleted file mode 100644 index 558e730f6ef..00000000000 --- a/lib/editor/atto/plugins/italic/pix/italic.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js index 78285fc89a1..78b18b25b6c 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js @@ -32,7 +32,7 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js index 568d6df8814..8e51967a5e5 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js index 78285fc89a1..78b18b25b6c 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js @@ -32,7 +32,7 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js index c22dcce318e..d7da568e8f7 100644 --- a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/link/lib.php b/lib/editor/atto/plugins/link/lib.php index 56067e7d230..90b953c66d7 100644 --- a/lib/editor/atto/plugins/link/lib.php +++ b/lib/editor/atto/plugins/link/lib.php @@ -31,9 +31,9 @@ defined('MOODLE_INTERNAL') || die(); function atto_link_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('link', + $icon = $OUTPUT->pix_icon('e/insert_edit_link', get_string('link', 'atto_link'), - 'atto_link', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createlink', @@ -44,14 +44,14 @@ function atto_link_init_editor($elementid) { $PAGE->requires->yui_module('moodle-atto_link-button', 'M.atto_link.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_link_sort_order() { return 11; diff --git a/lib/editor/atto/plugins/link/pix/link.png b/lib/editor/atto/plugins/link/pix/link.png deleted file mode 100644 index 5a0ac7f4a68..00000000000 Binary files a/lib/editor/atto/plugins/link/pix/link.png and /dev/null differ diff --git a/lib/editor/atto/plugins/link/pix/link.svg b/lib/editor/atto/plugins/link/pix/link.svg deleted file mode 100644 index 13bfc7c209b..00000000000 --- a/lib/editor/atto/plugins/link/pix/link.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js index c352f07b7fe..69cc68918ee 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js @@ -56,7 +56,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js index 64546785d78..68806afcb60 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,t,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r;if(!t)return;n=e.one(t).ancestor("a"),n&&(r=n.getAttribute("href"),r!==""&&(M.atto_link.selection=M.editor_atto.get_selection_from_node(n),e.one("#atto_link_urlentry").set("value",r)))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(e){e.preventDefault(),M.atto_link.dialogue.hide();var t=e.currentTarget.get("parentNode").one("input"),n=t.get("value");n!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,n))},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,e.group,t,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r;if(!t)return;n=e.one(t).ancestor("a"),n&&(r=n.getAttribute("href"),r!==""&&(M.atto_link.selection=M.editor_atto.get_selection_from_node(n),e.one("#atto_link_urlentry").set("value",r)))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(e){e.preventDefault(),M.atto_link.dialogue.hide();var t=e.currentTarget.get("parentNode").one("input"),n=t.get("value");n!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,n))},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js index c352f07b7fe..69cc68918ee 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js @@ -56,7 +56,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/link/yui/src/button/js/button.js b/lib/editor/atto/plugins/link/yui/src/button/js/button.js index b719e9a92b5..329e1f7b99e 100644 --- a/lib/editor/atto/plugins/link/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/link/yui/src/button/js/button.js @@ -54,7 +54,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/media/lib.php b/lib/editor/atto/plugins/media/lib.php index d0a4428191c..c38198b3390 100644 --- a/lib/editor/atto/plugins/media/lib.php +++ b/lib/editor/atto/plugins/media/lib.php @@ -29,9 +29,9 @@ function atto_media_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('media', + $icon = $OUTPUT->pix_icon('e/insert_edit_video', get_string('media', 'atto_media'), - 'atto_media', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createmedia', @@ -42,14 +42,14 @@ function atto_media_init_editor($elementid) { 'atto_media'); $PAGE->requires->yui_module('moodle-atto_media-button', 'M.atto_media.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'file')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_media_sort_order() { return 14; diff --git a/lib/editor/atto/plugins/media/pix/media.png b/lib/editor/atto/plugins/media/pix/media.png deleted file mode 100644 index 36b2828d1e8..00000000000 Binary files a/lib/editor/atto/plugins/media/pix/media.png and /dev/null differ diff --git a/lib/editor/atto/plugins/media/pix/media.svg b/lib/editor/atto/plugins/media/pix/media.svg deleted file mode 100644 index 4842828b9aa..00000000000 --- a/lib/editor/atto/plugins/media/pix/media.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js index 587b48280b1..e4fcc22e3f4 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js @@ -54,7 +54,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js index 207fa8fa358..5faab6eb045 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s=''+i+"";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s=''+i+"";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},get_form_content:function(t){var n=e.Node.create('"+"
"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js index 587b48280b1..e4fcc22e3f4 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js @@ -54,7 +54,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/media/yui/src/button/js/button.js b/lib/editor/atto/plugins/media/yui/src/button/js/button.js index ccbbbb5c292..70fe607198f 100644 --- a/lib/editor/atto/plugins/media/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/media/yui/src/button/js/button.js @@ -52,7 +52,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/orderedlist/lib.php b/lib/editor/atto/plugins/orderedlist/lib.php index 524202c1f2c..0fe7d650b53 100644 --- a/lib/editor/atto/plugins/orderedlist/lib.php +++ b/lib/editor/atto/plugins/orderedlist/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_orderedlist_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('orderedlist', + $icon = $OUTPUT->pix_icon('e/numbered_list', get_string('orderedlist', 'atto_orderedlist'), - 'atto_orderedlist', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_orderedlist-button', 'M.atto_orderedlist.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return array groupname followed by the absolute position within the toolbar */ function atto_orderedlist_sort_order() { return 6; diff --git a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png b/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png deleted file mode 100644 index 33fbb630805..00000000000 Binary files a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png and /dev/null differ diff --git a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg b/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg deleted file mode 100644 index 1bf589a92c4..00000000000 --- a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js index c1a07064680..a2cc475acb3 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js @@ -32,7 +32,7 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js index d606ba09c67..d5cc7646679 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js index c1a07064680..a2cc475acb3 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js @@ -32,7 +32,7 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js index 8f549432b58..93a00c08597 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/lib.php b/lib/editor/atto/plugins/outdent/lib.php index 29cca4ce587..1383604d4e0 100644 --- a/lib/editor/atto/plugins/outdent/lib.php +++ b/lib/editor/atto/plugins/outdent/lib.php @@ -29,21 +29,21 @@ function atto_outdent_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('outdent', + $icon = $OUTPUT->pix_icon('e/decrease_indent', get_string('outdent', 'atto_outdent'), - 'atto_outdent', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_outdent-button', 'M.atto_outdent.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_outdent_sort_order() { return 4; diff --git a/lib/editor/atto/plugins/outdent/pix/outdent.png b/lib/editor/atto/plugins/outdent/pix/outdent.png deleted file mode 100644 index 2c708fa7b96..00000000000 Binary files a/lib/editor/atto/plugins/outdent/pix/outdent.png and /dev/null differ diff --git a/lib/editor/atto/plugins/outdent/pix/outdent.svg b/lib/editor/atto/plugins/outdent/pix/outdent.svg deleted file mode 100644 index 875d8708e38..00000000000 --- a/lib/editor/atto/plugins/outdent/pix/outdent.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js index cd8bd527ec6..c0a4827d4d1 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js @@ -32,7 +32,7 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js index 4d14a825599..16df6c46ae8 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js index cd8bd527ec6..c0a4827d4d1 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js @@ -32,7 +32,7 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js index 2f7eebc3f9e..96e8a9c0b67 100644 --- a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/lib.php b/lib/editor/atto/plugins/strike/lib.php index 000bb44d737..22e77966409 100644 --- a/lib/editor/atto/plugins/strike/lib.php +++ b/lib/editor/atto/plugins/strike/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_strike_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('strike', + $icon = $OUTPUT->pix_icon('e/strikethrough', get_string('strike', 'atto_strike'), - 'atto_strike', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_strike-button', 'M.atto_strike.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int absolute position within the toolbar */ function atto_strike_sort_order() { return 3; diff --git a/lib/editor/atto/plugins/strike/pix/strike.png b/lib/editor/atto/plugins/strike/pix/strike.png deleted file mode 100644 index c5c3a618209..00000000000 Binary files a/lib/editor/atto/plugins/strike/pix/strike.png and /dev/null differ diff --git a/lib/editor/atto/plugins/strike/pix/strike.svg b/lib/editor/atto/plugins/strike/pix/strike.svg deleted file mode 100644 index 214f25716d8..00000000000 --- a/lib/editor/atto/plugins/strike/pix/strike.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js index 34f2908e848..3807083bb86 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js @@ -32,7 +32,7 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js index d37fd84168a..873cb8c3c0d 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js index 34f2908e848..3807083bb86 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js @@ -32,7 +32,7 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js index 06b0629502d..c69ce0d1476 100644 --- a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/title/lib.php b/lib/editor/atto/plugins/title/lib.php index 6f40550c7d8..ae81ffd9d18 100644 --- a/lib/editor/atto/plugins/title/lib.php +++ b/lib/editor/atto/plugins/title/lib.php @@ -31,9 +31,13 @@ defined('MOODLE_INTERNAL') || die(); function atto_title_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('title', + $icon = $OUTPUT->pix_icon('e/styleprops', get_string('title', 'atto_title'), - 'atto_title', + 'moodle', + array('class'=>'icon')); + $icon .= $OUTPUT->pix_icon('t/expanded', + get_string('title', 'atto_title'), + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('h3', @@ -44,14 +48,14 @@ function atto_title_init_editor($elementid) { 'p'), 'atto_title'); $PAGE->requires->yui_module('moodle-atto_title-button', 'M.atto_title.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'title')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_title_sort_order() { return 9; diff --git a/lib/editor/atto/plugins/title/pix/title.png b/lib/editor/atto/plugins/title/pix/title.png deleted file mode 100644 index 9a587fb1440..00000000000 Binary files a/lib/editor/atto/plugins/title/pix/title.png and /dev/null differ diff --git a/lib/editor/atto/plugins/title/pix/title.svg b/lib/editor/atto/plugins/title/pix/title.svg deleted file mode 100644 index 18f1b62ee87..00000000000 --- a/lib/editor/atto/plugins/title/pix/title.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js index 641b0e5e92f..1908ff6bb6c 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js @@ -53,6 +53,7 @@ M.atto_title = M.atto_title || { M.editor_atto.add_toolbar_menu(params.elementid, 'title', params.icon, + params.group, [ {'text' : h3, 'handler' : click_h3}, {'text' : h4, 'handler' : click_h4}, diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js index 2235d53c86e..9dfde66a4df 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"
")},n=function(e,t){M.atto_title.change_title(e,t,"")},r=function(e,t){M.atto_title.change_title(e,t,"")},i=function(e,t){M.atto_title.change_title(e,t,"")},s=function(e,t){M.atto_title.change_title(e,t,"")},o=function(e,t){M.atto_title.change_title(e,t,"")},u="
"+M.util.get_string("h3","atto_title")+"
",a=""+M.util.get_string("h4","atto_title")+"
",f=""+M.util.get_string("h5","atto_title")+"
",l=""+M.util.get_string("pre","atto_title")+"",c=" "+M.util.get_string("blockquote","atto_title")+"
",h=""+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"")},n=function(e,t){M.atto_title.change_title(e,t,"")},r=function(e,t){M.atto_title.change_title(e,t,"")},i=function(e,t){M.atto_title.change_title(e,t,"")},s=function(e,t){M.atto_title.change_title(e,t,"")},o=function(e,t){M.atto_title.change_title(e,t,"")},u="
"+M.util.get_string("h3","atto_title")+"
",a=""+M.util.get_string("h4","atto_title")+"
",f=""+M.util.get_string("h5","atto_title")+"
",l=""+M.util.get_string("pre","atto_title")+"",c=" "+M.util.get_string("blockquote","atto_title")+"
",h=""+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,e.group,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
index 641b0e5e92f..1908ff6bb6c 100644
--- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
+++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
@@ -53,6 +53,7 @@ M.atto_title = M.atto_title || {
M.editor_atto.add_toolbar_menu(params.elementid,
'title',
params.icon,
+ params.group,
[
{'text' : h3, 'handler' : click_h3},
{'text' : h4, 'handler' : click_h4},
diff --git a/lib/editor/atto/plugins/title/yui/src/button/js/button.js b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
index d6241e496b0..151311a591b 100644
--- a/lib/editor/atto/plugins/title/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
@@ -51,6 +51,7 @@ M.atto_title = M.atto_title || {
M.editor_atto.add_toolbar_menu(params.elementid,
'title',
params.icon,
+ params.group,
[
{'text' : h3, 'handler' : click_h3},
{'text' : h4, 'handler' : click_h4},
diff --git a/lib/editor/atto/plugins/underline/lib.php b/lib/editor/atto/plugins/underline/lib.php
index bde1f90be8a..946145df476 100644
--- a/lib/editor/atto/plugins/underline/lib.php
+++ b/lib/editor/atto/plugins/underline/lib.php
@@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die();
function atto_underline_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('underline',
+ $icon = $OUTPUT->pix_icon('e/underline',
get_string('underline', 'atto_underline'),
- 'atto_underline',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_underline-button',
'M.atto_underline.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_underline_sort_order() {
return 2;
diff --git a/lib/editor/atto/plugins/underline/pix/underline.png b/lib/editor/atto/plugins/underline/pix/underline.png
deleted file mode 100644
index 329e4970db0..00000000000
Binary files a/lib/editor/atto/plugins/underline/pix/underline.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/underline/pix/underline.svg b/lib/editor/atto/plugins/underline/pix/underline.svg
deleted file mode 100644
index 1d1feb4d523..00000000000
--- a/lib/editor/atto/plugins/underline/pix/underline.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
index caa347e4017..218a6705384 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
@@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || {
document.execCommand('underline', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
index 6954ce22235..86d3a2f098e 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
index caa347e4017..218a6705384 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
@@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || {
document.execCommand('underline', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
index f4ac98f8806..973461022af 100644
--- a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_underline = M.atto_underline || {
document.execCommand('underline', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unlink/lib.php b/lib/editor/atto/plugins/unlink/lib.php
index eef044961ac..b1023b046c5 100644
--- a/lib/editor/atto/plugins/unlink/lib.php
+++ b/lib/editor/atto/plugins/unlink/lib.php
@@ -29,21 +29,21 @@
function atto_unlink_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('unlink',
+ $icon = $OUTPUT->pix_icon('e/remove_link',
get_string('unlink', 'atto_unlink'),
- 'atto_unlink',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_unlink-button',
'M.atto_unlink.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_unlink_sort_order() {
return 12;
diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.png b/lib/editor/atto/plugins/unlink/pix/unlink.png
deleted file mode 100644
index 1dbbb9ccd0c..00000000000
Binary files a/lib/editor/atto/plugins/unlink/pix/unlink.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.svg b/lib/editor/atto/plugins/unlink/pix/unlink.svg
deleted file mode 100644
index 79126bcda80..00000000000
--- a/lib/editor/atto/plugins/unlink/pix/unlink.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
index 365a993c350..89959a891b3 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
@@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || {
document.execCommand('unlink', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
index 4f412d02606..c306b0a19ea 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
index 365a993c350..89959a891b3 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
@@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || {
document.execCommand('unlink', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
index fd19d81ea2a..73923fba978 100644
--- a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_unlink = M.atto_unlink || {
document.execCommand('unlink', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unorderedlist/lib.php b/lib/editor/atto/plugins/unorderedlist/lib.php
index 6224f905bab..b70903eb262 100644
--- a/lib/editor/atto/plugins/unorderedlist/lib.php
+++ b/lib/editor/atto/plugins/unorderedlist/lib.php
@@ -29,21 +29,21 @@
function atto_unorderedlist_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('unorderedlist',
+ $icon = $OUTPUT->pix_icon('e/bullet_list',
get_string('unorderedlist', 'atto_unorderedlist'),
- 'atto_unorderedlist',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_unorderedlist-button',
'M.atto_unorderedlist.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_unorderedlist_sort_order() {
return 7;
diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png
deleted file mode 100644
index 95b9d12d548..00000000000
Binary files a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg
deleted file mode 100644
index 8cf123137e3..00000000000
--- a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
index 4915b2e40d7..e430b83d2fc 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
@@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
document.execCommand('insertUnorderedList', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
index 5694eae1bf4..dc606fc7f52 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
index 4915b2e40d7..e430b83d2fc 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
@@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
document.execCommand('insertUnorderedList', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
index e86e3e9f84f..6e1d30cf283 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
document.execCommand('insertUnorderedList', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css
index e794e853fe6..6511ee9f515 100644
--- a/lib/editor/atto/styles.css
+++ b/lib/editor/atto/styles.css
@@ -1,30 +1,40 @@
div.editor_atto {
background-color: white;
border: 1px solid #BBB;
+ width: 100%;
}
.editor_atto + textarea {
width: 100%;
padding: 0;
+ resize: vertical;
+ border-radius: 0;
+ border: 1px solid #BBB;
}
div.editor_atto_toolbar {
display: block;
background: #F2F2F2;
- min-height: 36px;
+ min-height: 42px;
border-top: 1px solid #BBB;
border-left: 1px solid #BBB;
border-right: 1px solid #BBB;
+ width: 100%;
+ padding: 0 0 9px 0;
}
div.editor_atto_toolbar button {
- margin-top: 5px;
- margin-bottom: 0px;
- padding: 3px;
+ padding: 5px 9px 4px 9px;
background: none;
- border: none;
+ border: 0px;
+ margin: 0;
+ border-radius: 0;
}
+div.editor_atto_toolbar button + button {
+ border-left: 1px solid #CCC;
+}
+
div.editor_atto_toolbar button[disabled] {
opacity: .45;
}
@@ -33,30 +43,20 @@ div.editor_atto_toolbar button img {
padding: 1px;
}
-div.editor_atto_toolbar button.atto_strike_button,
-div.editor_atto_toolbar button.atto_unorderedlist_button,
-div.editor_atto_toolbar button.atto_clear_button,
-div.editor_atto_toolbar button.atto_indent_button {
- margin-right: 1em;
-}
-body.dir-rtl div.editor_atto_toolbar button.atto_strike_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_unorderedlist_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_clear_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
- margin-right: 0px;
- margin-left: 1em;
-}
-.atto_hasmenu .icon {
- width: 32px;
+div.editor_atto_toolbar div.atto_group {
+ display: inline-block;
+ border: 1px solid #CCC;
+ border-bottom: 1px solid #B3B3B3;
+ border-radius: 4px;
+ margin: 9px 0px 0px 9px;
+ background: #FFF;
}
.editor_atto img {
resize: both; overflow: auto;
}
-.atto_menuentry {
- clear: left;
-}
+
.atto_menuentry img {
width: 16px;
height: 16px;
@@ -74,6 +74,7 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
.atto_menuentry {
border-bottom: 1px solid #eee;
padding: 2px;
+ clear: left;
}
.atto_menuentry h1,
@@ -88,3 +89,16 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
margin: 5px;
}
+/* RTL Rules */
+body.dir-rtl div.editor_atto_toolbar button + button {
+ border-left: 0;
+ border-right: 1px solid #CCC;
+}
+
+body.dir-rtl div.editor_atto_toolbar img.icon {
+ padding: 0;
+}
+
+body.dir-rtl div.editor_atto_toolbar div.atto_group {
+ margin: 9px 9px 0px 0px;
+}
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 495df236b09..96ccd495ef5 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -154,17 +154,33 @@ M.editor_atto = M.editor_atto || {
* @param string elementid - the id of the textarea we created this editor from.
* @param string plugin - the plugin defining the button
* @param string icon - the html used for the content of the button
+ * @param string groupname - the group the button should be appended to.
* @handler function handler- A function to call when the button is clicked.
*/
- add_toolbar_menu : function(elementid, plugin, icon, entries) {
- var toolbar = Y.one('#' + elementid + '_toolbar');
- var button = Y.Node.create('
")},i=function(e,t){M.atto_title.change_title(e,t,"")},s=function(e,t){M.atto_title.change_title(e,t,"")},o=function(e,t){M.atto_title.change_title(e,t,"")},u="
"+M.util.get_string("h3","atto_title")+"
",a=""+M.util.get_string("h4","atto_title")+"
",f=""+M.util.get_string("h5","atto_title")+"
",l=""+M.util.get_string("pre","atto_title")+"",c=" "+M.util.get_string("blockquote","atto_title")+"
",h=""+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"")},n=function(e,t){M.atto_title.change_title(e,t,"")},r=function(e,t){M.atto_title.change_title(e,t,"")},i=function(e,t){M.atto_title.change_title(e,t,"")},s=function(e,t){M.atto_title.change_title(e,t,"")},o=function(e,t){M.atto_title.change_title(e,t,"")},u="
"+M.util.get_string("h3","atto_title")+"
",a=""+M.util.get_string("h4","atto_title")+"
",f=""+M.util.get_string("h5","atto_title")+"
",l=""+M.util.get_string("pre","atto_title")+"",c=" "+M.util.get_string("blockquote","atto_title")+"
",h=""+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,e.group,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
index 641b0e5e92f..1908ff6bb6c 100644
--- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
+++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
@@ -53,6 +53,7 @@ M.atto_title = M.atto_title || {
M.editor_atto.add_toolbar_menu(params.elementid,
'title',
params.icon,
+ params.group,
[
{'text' : h3, 'handler' : click_h3},
{'text' : h4, 'handler' : click_h4},
diff --git a/lib/editor/atto/plugins/title/yui/src/button/js/button.js b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
index d6241e496b0..151311a591b 100644
--- a/lib/editor/atto/plugins/title/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
@@ -51,6 +51,7 @@ M.atto_title = M.atto_title || {
M.editor_atto.add_toolbar_menu(params.elementid,
'title',
params.icon,
+ params.group,
[
{'text' : h3, 'handler' : click_h3},
{'text' : h4, 'handler' : click_h4},
diff --git a/lib/editor/atto/plugins/underline/lib.php b/lib/editor/atto/plugins/underline/lib.php
index bde1f90be8a..946145df476 100644
--- a/lib/editor/atto/plugins/underline/lib.php
+++ b/lib/editor/atto/plugins/underline/lib.php
@@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die();
function atto_underline_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('underline',
+ $icon = $OUTPUT->pix_icon('e/underline',
get_string('underline', 'atto_underline'),
- 'atto_underline',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_underline-button',
'M.atto_underline.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_underline_sort_order() {
return 2;
diff --git a/lib/editor/atto/plugins/underline/pix/underline.png b/lib/editor/atto/plugins/underline/pix/underline.png
deleted file mode 100644
index 329e4970db0..00000000000
Binary files a/lib/editor/atto/plugins/underline/pix/underline.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/underline/pix/underline.svg b/lib/editor/atto/plugins/underline/pix/underline.svg
deleted file mode 100644
index 1d1feb4d523..00000000000
--- a/lib/editor/atto/plugins/underline/pix/underline.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
index caa347e4017..218a6705384 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
@@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || {
document.execCommand('underline', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
index 6954ce22235..86d3a2f098e 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
index caa347e4017..218a6705384 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
@@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || {
document.execCommand('underline', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
index f4ac98f8806..973461022af 100644
--- a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_underline = M.atto_underline || {
document.execCommand('underline', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unlink/lib.php b/lib/editor/atto/plugins/unlink/lib.php
index eef044961ac..b1023b046c5 100644
--- a/lib/editor/atto/plugins/unlink/lib.php
+++ b/lib/editor/atto/plugins/unlink/lib.php
@@ -29,21 +29,21 @@
function atto_unlink_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('unlink',
+ $icon = $OUTPUT->pix_icon('e/remove_link',
get_string('unlink', 'atto_unlink'),
- 'atto_unlink',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_unlink-button',
'M.atto_unlink.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_unlink_sort_order() {
return 12;
diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.png b/lib/editor/atto/plugins/unlink/pix/unlink.png
deleted file mode 100644
index 1dbbb9ccd0c..00000000000
Binary files a/lib/editor/atto/plugins/unlink/pix/unlink.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.svg b/lib/editor/atto/plugins/unlink/pix/unlink.svg
deleted file mode 100644
index 79126bcda80..00000000000
--- a/lib/editor/atto/plugins/unlink/pix/unlink.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
index 365a993c350..89959a891b3 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
@@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || {
document.execCommand('unlink', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
index 4f412d02606..c306b0a19ea 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
index 365a993c350..89959a891b3 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
@@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || {
document.execCommand('unlink', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
index fd19d81ea2a..73923fba978 100644
--- a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_unlink = M.atto_unlink || {
document.execCommand('unlink', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unorderedlist/lib.php b/lib/editor/atto/plugins/unorderedlist/lib.php
index 6224f905bab..b70903eb262 100644
--- a/lib/editor/atto/plugins/unorderedlist/lib.php
+++ b/lib/editor/atto/plugins/unorderedlist/lib.php
@@ -29,21 +29,21 @@
function atto_unorderedlist_init_editor($elementid) {
global $PAGE, $OUTPUT;
- $icon = $OUTPUT->pix_icon('unorderedlist',
+ $icon = $OUTPUT->pix_icon('e/bullet_list',
get_string('unorderedlist', 'atto_unorderedlist'),
- 'atto_unorderedlist',
+ 'moodle',
array('class'=>'icon'));
$PAGE->requires->yui_module('moodle-atto_unorderedlist-button',
'M.atto_unorderedlist.init',
- array(array('elementid'=>$elementid, 'icon'=>$icon)),
+ array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')),
true);
}
/**
* Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
*/
function atto_unorderedlist_sort_order() {
return 7;
diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png
deleted file mode 100644
index 95b9d12d548..00000000000
Binary files a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg
deleted file mode 100644
index 8cf123137e3..00000000000
--- a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
index 4915b2e40d7..e430b83d2fc 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
@@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
document.execCommand('insertUnorderedList', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
index 5694eae1bf4..dc606fc7f52 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
index 4915b2e40d7..e430b83d2fc 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
@@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
document.execCommand('insertUnorderedList', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
index e86e3e9f84f..6e1d30cf283 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
document.execCommand('insertUnorderedList', false, null);
};
- M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+ M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
}
};
diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css
index e794e853fe6..6511ee9f515 100644
--- a/lib/editor/atto/styles.css
+++ b/lib/editor/atto/styles.css
@@ -1,30 +1,40 @@
div.editor_atto {
background-color: white;
border: 1px solid #BBB;
+ width: 100%;
}
.editor_atto + textarea {
width: 100%;
padding: 0;
+ resize: vertical;
+ border-radius: 0;
+ border: 1px solid #BBB;
}
div.editor_atto_toolbar {
display: block;
background: #F2F2F2;
- min-height: 36px;
+ min-height: 42px;
border-top: 1px solid #BBB;
border-left: 1px solid #BBB;
border-right: 1px solid #BBB;
+ width: 100%;
+ padding: 0 0 9px 0;
}
div.editor_atto_toolbar button {
- margin-top: 5px;
- margin-bottom: 0px;
- padding: 3px;
+ padding: 5px 9px 4px 9px;
background: none;
- border: none;
+ border: 0px;
+ margin: 0;
+ border-radius: 0;
}
+div.editor_atto_toolbar button + button {
+ border-left: 1px solid #CCC;
+}
+
div.editor_atto_toolbar button[disabled] {
opacity: .45;
}
@@ -33,30 +43,20 @@ div.editor_atto_toolbar button img {
padding: 1px;
}
-div.editor_atto_toolbar button.atto_strike_button,
-div.editor_atto_toolbar button.atto_unorderedlist_button,
-div.editor_atto_toolbar button.atto_clear_button,
-div.editor_atto_toolbar button.atto_indent_button {
- margin-right: 1em;
-}
-body.dir-rtl div.editor_atto_toolbar button.atto_strike_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_unorderedlist_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_clear_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
- margin-right: 0px;
- margin-left: 1em;
-}
-.atto_hasmenu .icon {
- width: 32px;
+div.editor_atto_toolbar div.atto_group {
+ display: inline-block;
+ border: 1px solid #CCC;
+ border-bottom: 1px solid #B3B3B3;
+ border-radius: 4px;
+ margin: 9px 0px 0px 9px;
+ background: #FFF;
}
.editor_atto img {
resize: both; overflow: auto;
}
-.atto_menuentry {
- clear: left;
-}
+
.atto_menuentry img {
width: 16px;
height: 16px;
@@ -74,6 +74,7 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
.atto_menuentry {
border-bottom: 1px solid #eee;
padding: 2px;
+ clear: left;
}
.atto_menuentry h1,
@@ -88,3 +89,16 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
margin: 5px;
}
+/* RTL Rules */
+body.dir-rtl div.editor_atto_toolbar button + button {
+ border-left: 0;
+ border-right: 1px solid #CCC;
+}
+
+body.dir-rtl div.editor_atto_toolbar img.icon {
+ padding: 0;
+}
+
+body.dir-rtl div.editor_atto_toolbar div.atto_group {
+ margin: 9px 9px 0px 0px;
+}
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 495df236b09..96ccd495ef5 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -154,17 +154,33 @@ M.editor_atto = M.editor_atto || {
* @param string elementid - the id of the textarea we created this editor from.
* @param string plugin - the plugin defining the button
* @param string icon - the html used for the content of the button
+ * @param string groupname - the group the button should be appended to.
* @handler function handler- A function to call when the button is clicked.
*/
- add_toolbar_menu : function(elementid, plugin, icon, entries) {
- var toolbar = Y.one('#' + elementid + '_toolbar');
- var button = Y.Node.create('
")},o=function(e,t){M.atto_title.change_title(e,t,"")},u="
"+M.util.get_string("h3","atto_title")+"
",a=""+M.util.get_string("h4","atto_title")+"
",f=""+M.util.get_string("h5","atto_title")+"
",l=""+M.util.get_string("pre","atto_title")+"",c=""+M.util.get_string("blockquote","atto_title")+"
",h=""+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"")},n=function(e,t){M.atto_title.change_title(e,t,"
")},r=function(e,t){M.atto_title.change_title(e,t,"
")},i=function(e,t){M.atto_title.change_title(e,t,"
")},s=function(e,t){M.atto_title.change_title(e,t,"")},o=function(e,t){M.atto_title.change_title(e,t,"")},u="
"+M.util.get_string("h3","atto_title")+"
",a=""+M.util.get_string("h4","atto_title")+"
",f=""+M.util.get_string("h5","atto_title")+"
",l=""+M.util.get_string("pre","atto_title")+"",c=""+M.util.get_string("blockquote","atto_title")+"
",h=""+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,e.group,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js index 641b0e5e92f..1908ff6bb6c 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js @@ -53,6 +53,7 @@ M.atto_title = M.atto_title || { M.editor_atto.add_toolbar_menu(params.elementid, 'title', params.icon, + params.group, [ {'text' : h3, 'handler' : click_h3}, {'text' : h4, 'handler' : click_h4}, diff --git a/lib/editor/atto/plugins/title/yui/src/button/js/button.js b/lib/editor/atto/plugins/title/yui/src/button/js/button.js index d6241e496b0..151311a591b 100644 --- a/lib/editor/atto/plugins/title/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/title/yui/src/button/js/button.js @@ -51,6 +51,7 @@ M.atto_title = M.atto_title || { M.editor_atto.add_toolbar_menu(params.elementid, 'title', params.icon, + params.group, [ {'text' : h3, 'handler' : click_h3}, {'text' : h4, 'handler' : click_h4}, diff --git a/lib/editor/atto/plugins/underline/lib.php b/lib/editor/atto/plugins/underline/lib.php index bde1f90be8a..946145df476 100644 --- a/lib/editor/atto/plugins/underline/lib.php +++ b/lib/editor/atto/plugins/underline/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_underline_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('underline', + $icon = $OUTPUT->pix_icon('e/underline', get_string('underline', 'atto_underline'), - 'atto_underline', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_underline-button', 'M.atto_underline.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_underline_sort_order() { return 2; diff --git a/lib/editor/atto/plugins/underline/pix/underline.png b/lib/editor/atto/plugins/underline/pix/underline.png deleted file mode 100644 index 329e4970db0..00000000000 Binary files a/lib/editor/atto/plugins/underline/pix/underline.png and /dev/null differ diff --git a/lib/editor/atto/plugins/underline/pix/underline.svg b/lib/editor/atto/plugins/underline/pix/underline.svg deleted file mode 100644 index 1d1feb4d523..00000000000 --- a/lib/editor/atto/plugins/underline/pix/underline.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js index caa347e4017..218a6705384 100644 --- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js +++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js @@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || { document.execCommand('underline', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js index 6954ce22235..86d3a2f098e 100644 --- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js +++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js index caa347e4017..218a6705384 100644 --- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js +++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js @@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || { document.execCommand('underline', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js index f4ac98f8806..973461022af 100644 --- a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_underline = M.atto_underline || { document.execCommand('underline', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/unlink/lib.php b/lib/editor/atto/plugins/unlink/lib.php index eef044961ac..b1023b046c5 100644 --- a/lib/editor/atto/plugins/unlink/lib.php +++ b/lib/editor/atto/plugins/unlink/lib.php @@ -29,21 +29,21 @@ function atto_unlink_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('unlink', + $icon = $OUTPUT->pix_icon('e/remove_link', get_string('unlink', 'atto_unlink'), - 'atto_unlink', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_unlink-button', 'M.atto_unlink.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_unlink_sort_order() { return 12; diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.png b/lib/editor/atto/plugins/unlink/pix/unlink.png deleted file mode 100644 index 1dbbb9ccd0c..00000000000 Binary files a/lib/editor/atto/plugins/unlink/pix/unlink.png and /dev/null differ diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.svg b/lib/editor/atto/plugins/unlink/pix/unlink.svg deleted file mode 100644 index 79126bcda80..00000000000 --- a/lib/editor/atto/plugins/unlink/pix/unlink.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js index 365a993c350..89959a891b3 100644 --- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js +++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js @@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || { document.execCommand('unlink', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js index 4f412d02606..c306b0a19ea 100644 --- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js +++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js index 365a993c350..89959a891b3 100644 --- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js +++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js @@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || { document.execCommand('unlink', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js index fd19d81ea2a..73923fba978 100644 --- a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_unlink = M.atto_unlink || { document.execCommand('unlink', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/unorderedlist/lib.php b/lib/editor/atto/plugins/unorderedlist/lib.php index 6224f905bab..b70903eb262 100644 --- a/lib/editor/atto/plugins/unorderedlist/lib.php +++ b/lib/editor/atto/plugins/unorderedlist/lib.php @@ -29,21 +29,21 @@ function atto_unorderedlist_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('unorderedlist', + $icon = $OUTPUT->pix_icon('e/bullet_list', get_string('unorderedlist', 'atto_unorderedlist'), - 'atto_unorderedlist', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_unorderedlist-button', 'M.atto_unorderedlist.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_unorderedlist_sort_order() { return 7; diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png deleted file mode 100644 index 95b9d12d548..00000000000 Binary files a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png and /dev/null differ diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg deleted file mode 100644 index 8cf123137e3..00000000000 --- a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js index 4915b2e40d7..e430b83d2fc 100644 --- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js +++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js @@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || { document.execCommand('insertUnorderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js index 5694eae1bf4..dc606fc7f52 100644 --- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js +++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js index 4915b2e40d7..e430b83d2fc 100644 --- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js +++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js @@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || { document.execCommand('insertUnorderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js index e86e3e9f84f..6e1d30cf283 100644 --- a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_unorderedlist = M.atto_unorderedlist || { document.execCommand('insertUnorderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css index e794e853fe6..6511ee9f515 100644 --- a/lib/editor/atto/styles.css +++ b/lib/editor/atto/styles.css @@ -1,30 +1,40 @@ div.editor_atto { background-color: white; border: 1px solid #BBB; + width: 100%; } .editor_atto + textarea { width: 100%; padding: 0; + resize: vertical; + border-radius: 0; + border: 1px solid #BBB; } div.editor_atto_toolbar { display: block; background: #F2F2F2; - min-height: 36px; + min-height: 42px; border-top: 1px solid #BBB; border-left: 1px solid #BBB; border-right: 1px solid #BBB; + width: 100%; + padding: 0 0 9px 0; } div.editor_atto_toolbar button { - margin-top: 5px; - margin-bottom: 0px; - padding: 3px; + padding: 5px 9px 4px 9px; background: none; - border: none; + border: 0px; + margin: 0; + border-radius: 0; } +div.editor_atto_toolbar button + button { + border-left: 1px solid #CCC; +} + div.editor_atto_toolbar button[disabled] { opacity: .45; } @@ -33,30 +43,20 @@ div.editor_atto_toolbar button img { padding: 1px; } -div.editor_atto_toolbar button.atto_strike_button, -div.editor_atto_toolbar button.atto_unorderedlist_button, -div.editor_atto_toolbar button.atto_clear_button, -div.editor_atto_toolbar button.atto_indent_button { - margin-right: 1em; -} -body.dir-rtl div.editor_atto_toolbar button.atto_strike_button, -body.dir-rtl div.editor_atto_toolbar button.atto_unorderedlist_button, -body.dir-rtl div.editor_atto_toolbar button.atto_clear_button, -body.dir-rtl div.editor_atto_toolbar button.atto_indent_button { - margin-right: 0px; - margin-left: 1em; -} -.atto_hasmenu .icon { - width: 32px; +div.editor_atto_toolbar div.atto_group { + display: inline-block; + border: 1px solid #CCC; + border-bottom: 1px solid #B3B3B3; + border-radius: 4px; + margin: 9px 0px 0px 9px; + background: #FFF; } .editor_atto img { resize: both; overflow: auto; } -.atto_menuentry { - clear: left; -} + .atto_menuentry img { width: 16px; height: 16px; @@ -74,6 +74,7 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button { .atto_menuentry { border-bottom: 1px solid #eee; padding: 2px; + clear: left; } .atto_menuentry h1, @@ -88,3 +89,16 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button { margin: 5px; } +/* RTL Rules */ +body.dir-rtl div.editor_atto_toolbar button + button { + border-left: 0; + border-right: 1px solid #CCC; +} + +body.dir-rtl div.editor_atto_toolbar img.icon { + padding: 0; +} + +body.dir-rtl div.editor_atto_toolbar div.atto_group { + margin: 9px 9px 0px 0px; +} diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js index 495df236b09..96ccd495ef5 100644 --- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js +++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js @@ -154,17 +154,33 @@ M.editor_atto = M.editor_atto || { * @param string elementid - the id of the textarea we created this editor from. * @param string plugin - the plugin defining the button * @param string icon - the html used for the content of the button + * @param string groupname - the group the button should be appended to. * @handler function handler- A function to call when the button is clicked. */ - add_toolbar_menu : function(elementid, plugin, icon, entries) { - var toolbar = Y.one('#' + elementid + '_toolbar'); - var button = Y.Node.create('