'; // Header row: day names
@@ -1352,6 +1351,10 @@ function calendar_set_filters(array $courseeventsfrom, $ignorefilters = false) {
$user = false;
$group = false;
+ // capabilities that allow seeing group events from all groups
+ // TODO: rewrite so that moodle/calendar:manageentries is not necessary here
+ $allgroupscaps = array('moodle/site:accessallgroups', 'moodle/calendar:manageentries');
+
$isloggedin = isloggedin();
if ($ignorefilters || calendar_show_event_type(CALENDAR_EVENT_COURSE)) {
@@ -1377,26 +1380,35 @@ function calendar_set_filters(array $courseeventsfrom, $ignorefilters = false) {
if (!empty($courseeventsfrom) && (calendar_show_event_type(CALENDAR_EVENT_GROUP) || $ignorefilters)) {
- if (!empty($CFG->calendar_adminseesall) && has_capability('moodle/calendar:manageentries', get_system_context())) {
- $group = true;
- } else if ($isloggedin) {
- $groupids = array();
-
- // We already have the courses to examine in $courses
- // For each course...
- foreach ($courseeventsfrom as $courseid => $course) {
- // If the user is an editing teacher in there,
- if (!empty($USER->groupmember[$course->id])) {
- // We've already cached the users groups for this course so we can just use that
- $groupids = array_merge($groupids, $USER->groupmember[$course->id]);
- } else if (($course->groupmode != NOGROUPS || !$course->groupmodeforce) && has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $course->id))) {
- // If this course has groups, show events from all of them
- $coursegroups = groups_get_user_groups($course->id, $USER->id);
- $groupids = array_merge($groupids, $coursegroups['0']);
- }
+ if (count($courseeventsfrom)==1) {
+ $course = reset($courseeventsfrom);
+ if (has_any_capability($allgroupscaps, get_context_instance(CONTEXT_COURSE, $course->id))) {
+ $coursegroups = groups_get_all_groups($course->id, 0, 0, 'g.id');
+ $group = array_keys($coursegroups);
}
- if (!empty($groupids)) {
- $group = $groupids;
+ }
+ if ($group === false) {
+ if (!empty($CFG->calendar_adminseesall) && has_any_capability($allgroupscaps, get_system_context())) {
+ $group = true;
+ } else if ($isloggedin) {
+ $groupids = array();
+
+ // We already have the courses to examine in $courses
+ // For each course...
+ foreach ($courseeventsfrom as $courseid => $course) {
+ // If the user is an editing teacher in there,
+ if (!empty($USER->groupmember[$course->id])) {
+ // We've already cached the users groups for this course so we can just use that
+ $groupids = array_merge($groupids, $USER->groupmember[$course->id]);
+ } else if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
+ // If this course has groups, show events from all of those related to the current user
+ $coursegroups = groups_get_user_groups($course->id, $USER->id);
+ $groupids = array_merge($groupids, $coursegroups['0']);
+ }
+ }
+ if (!empty($groupids)) {
+ $group = $groupids;
+ }
}
}
}
diff --git a/comment/comment.js b/comment/comment.js
index dcf669e293e..a16b83a9c78 100644
--- a/comment/comment.js
+++ b/comment/comment.js
@@ -385,6 +385,9 @@ bodyContent: '
+ *
+ * @param form_filemanager $fm File manager to render
+ * @return string HTML fragment
+ */
+ public function render_form_filemanager($fm) {
+ static $filemanagertemplateloaded;
+ $html = $this->fm_print_generallayout($fm);
+ $module = array(
+ 'name'=>'form_filemanager',
+ 'fullpath'=>'/lib/form/filemanager.js',
+ 'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'),
+ 'strings' => array(
+ array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'),
+ array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'),
+ array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
+ array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
+ array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
+ array('confirmrenamefile', 'repository')
+ )
+ );
+ if (empty($filemanagertemplateloaded)) {
+ $filemanagertemplateloaded = true;
+ $this->page->requires->js_init_call('M.form_filemanager.set_templates',
+ array($this->filemanager_js_templates()), true, $module);
+ }
+ $this->page->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module);
+
+ // non javascript file manager
+ $html .= '';
+
+
+ return $html;
+ }
+
+ /**
+ * Returns html for displaying one file manager
+ *
+ * The main element in HTML must have id="filemanager-{$client_id}" and
+ * class="filemanager fm-loading";
+ * After all necessary code on the page (both html and javascript) is loaded,
+ * the class fm-loading will be removed and added class fm-loaded;
+ * The main element (class=filemanager) will be assigned the following classes:
+ * 'fm-maxfiles' - when filemanager has maximum allowed number of files;
+ * 'fm-nofiles' - when filemanager has no files at all (although there might be folders);
+ * 'fm-noitems' - when current view (folder) has no items - neither files nor folders;
+ * 'fm-updating' - when current view is being updated (usually means that loading icon is to be displayed);
+ * 'fm-nomkdir' - when 'Make folder' action is unavailable (empty($fm->options->subdirs) == true)
+ *
+ * Element with class 'filemanager-container' will be holding evens for dnd upload (dragover, etc.).
+ * It will have class:
+ * 'dndupload-ready' - when a file is being dragged over the browser
+ * 'dndupload-over' - when file is being dragged over this filepicker (additional to 'dndupload-ready')
+ * 'dndupload-uploading' - during the upload process (note that after dnd upload process is
+ * over, the file manager will refresh the files list and therefore will have for a while class
+ * fm-updating. Both waiting processes should look similar so the images don't jump for user)
+ *
+ * If browser supports Drag-and-drop, the body element will have class 'dndsupported',
+ * otherwise - 'dndnotsupported';
+ *
+ * Element with class 'fp-content' will be populated with files list;
+ * Element with class 'fp-btn-add' will hold onclick event for adding a file (opening filepicker);
+ * Element with class 'fp-btn-mkdir' will hold onclick event for adding new folder;
+ * Element with class 'fp-btn-download' will hold onclick event for download action;
+ *
+ * Element with class 'fp-path-folder' is a template for one folder in path toolbar.
+ * It will hold mouse click event and will be assigned classes first/last/even/odd respectfully.
+ * Parent element will receive class 'empty' when there are no folders to be displayed;
+ * The content of subelement with class 'fp-path-folder-name' will be substituted with folder name;
+ *
+ * Element with class 'fp-viewbar' will have the class 'enabled' or 'disabled' when view mode
+ * can be changed or not;
+ * Inside element with class 'fp-viewbar' there are expected elements with classes
+ * 'fp-vb-icons', 'fp-vb-tree' and 'fp-vb-details'. They will handle onclick events to switch
+ * between the view modes, the last clicked element will have the class 'checked';
+ *
+ * @param form_filemanager $fm
+ * @return string
+ */
+ private function fm_print_generallayout($fm) {
+ global $OUTPUT;
+ $options = $fm->options;
+ $client_id = $options->client_id;
+ $straddfile = get_string('addfile', 'repository');
+ $strmakedir = get_string('makeafolder', 'moodle');
+ $strdownload = get_string('downloadfolder', 'repository');
+ $strloading = get_string('loading', 'repository');
+ $strdroptoupload = get_string('droptoupload', 'moodle');
+ $icon_progress = $OUTPUT->pix_icon('i/loading_small', $strloading).'';
+ $restrictions = $this->fm_print_restrictions($fm);
+ $strdndenabled = get_string('dndenabled_insentence', 'moodle').$OUTPUT->help_icon('dndenabled');
+ $strdndenabledinbox = get_string('dndenabled_inbox', 'moodle');
+ $loading = get_string('loading', 'repository');
+
+ $html = '
+
';
+ return preg_replace('/\{\!\}/', '', $html);
+ }
+
+ /**
+ * FileManager JS template for displaying one file in 'icon view' mode.
+ *
+ * Except for elements described in fp_js_template_iconfilename, this template may also
+ * contain element with class 'fp-contextmenu'. If context menu is available for this
+ * file, the top element will receive the additional class 'fp-hascontextmenu' and
+ * the element with class 'fp-contextmenu' will hold onclick event for displaying
+ * the context menu.
+ *
+ * @see fp_js_template_iconfilename()
+ * @return string
+ */
+ private function fm_js_template_iconfilename() {
+ $rv = '
+
';
+ return preg_replace('/\{\!\}/', '', $rv);
+ }
+
+ /**
+ * FileManager JS template for displaying file name in 'table view' and 'tree view' modes.
+ *
+ * Except for elements described in fp_js_template_listfilename, this template may also
+ * contain element with class 'fp-contextmenu'. If context menu is available for this
+ * file, the top element will receive the additional class 'fp-hascontextmenu' and
+ * the element with class 'fp-contextmenu' will hold onclick event for displaying
+ * the context menu.
+ *
+ * @todo MDL-32736 remove onclick="return false;"
+ * @see fp_js_template_listfilename()
+ * @return string
+ */
+ private function fm_js_template_listfilename() {
+ $rv = '
+
+
+
+
+
+ '.$this->pix_icon('i/menu', '▶').'
+';
+ return preg_replace('/\{\!\}/', '', $rv);
+ }
+
+ /**
+ * FileManager JS template for displaying 'Make new folder' dialog.
+ *
+ * Must be wrapped in an element, CSS for this element must define width and height of the window;
+ *
+ * Must have one input element with type="text" (for users to enter the new folder name);
+ *
+ * content of element with class 'fp-dlg-curpath' will be replaced with current path where
+ * new folder is about to be created;
+ * elements with classes 'fp-dlg-butcreate' and 'fp-dlg-butcancel' will hold onclick events;
+ *
+ * @return string
+ */
+ private function fm_js_template_mkdir() {
+ $rv = '
+
';
+ return preg_replace('/\{\!\}/', '', $rv);
+ }
+
+ /**
+ * FileManager JS template for error/info message displayed as a separate popup window.
+ *
+ * @see fp_js_template_message()
+ * @return string
+ */
+ private function fm_js_template_message() {
+ return $this->fp_js_template_message();
+ }
+
+ /**
+ * FileManager JS template for window with file information/actions.
+ *
+ * All content must be enclosed in one element, CSS for this class must define width and
+ * height of the window;
+ *
+ * Thumbnail image will be added as content to the element with class 'fp-thumbnail';
+ *
+ * Inside the window the elements with the following classnames must be present:
+ * 'fp-saveas', 'fp-author', 'fp-license', 'fp-path'. Inside each of them must be
+ * one input element (or select in case of fp-license and fp-path). They may also have labels.
+ * The elements will be assign with class 'uneditable' and input/select element will become
+ * disabled if they are not applicable for the particular file;
+ *
+ * There may be present elements with classes 'fp-original', 'fp-datemodified', 'fp-datecreated',
+ * 'fp-size', 'fp-dimensions', 'fp-reflist'. They will receive additional class 'fp-unknown' if
+ * information is unavailable. If there is information available, the content of embedded
+ * element with class 'fp-value' will be substituted with the value;
+ *
+ * The value of Original ('fp-original') is loaded in separate request. When it is applicable
+ * but not yet loaded the 'fp-original' element receives additional class 'fp-loading';
+ *
+ * The value of 'Aliases/Shortcuts' ('fp-reflist') is also loaded in separate request. When it
+ * is applicable but not yet loaded the 'fp-original' element receives additional class
+ * 'fp-loading'. The string explaining that XX references exist will replace content of element
+ * 'fp-refcount'. Inside '.fp-reflist .fp-value' each reference will be enclosed in
;
+ *
+ * Elements with classes 'fp-file-update', 'fp-file-download', 'fp-file-delete', 'fp-file-zip',
+ * 'fp-file-unzip', 'fp-file-setmain' and 'fp-file-cancel' will hold corresponding onclick
+ * events (there may be several elements with class 'fp-file-cancel');
+ *
+ * When confirm button is pressed and file is being selected, the top element receives
+ * additional class 'loading'. It is removed when response from server is received.
+ *
+ * When any of the input fields is changed, the top element receives class 'fp-changed';
+ * When current file can be set as main - top element receives class 'fp-cansetmain';
+ * When current file is folder/zip/file - top element receives respectfully class
+ * 'fp-folder'/'fp-zip'/'fp-file';
+ *
+ * @return string
+ */
+ private function fm_js_template_fileselectlayout() {
+ $strloading = get_string('loading', 'repository');
+ $icon_progress = $this->pix_icon('i/loading_small', $strloading).'';
+ $rv = '
+
+
+
+
'.get_string('loading', 'repository').'
+
+
+
+
+
+
'.get_string('lastmodified', 'moodle').':
+
'.get_string('datecreated', 'repository').':
+
'.get_string('size', 'repository').':
+
'.get_string('dimensions', 'repository').':
+
+
';
+ return preg_replace('/\{\!\}/', '', $rv);
+ }
+
+ /**
+ * FileManager JS template for popup confirm dialogue window.
+ *
+ * Must have one top element, CSS for this element must define width and height of the window;
+ *
+ * content of element with class 'fp-dlg-text' will be replaced with dialog text;
+ * elements with classes 'fp-dlg-butconfirm' and 'fp-dlg-butcancel' will
+ * hold onclick events;
+ *
+ * @return string
+ */
+ private function fm_js_template_confirmdialog() {
+ $rv = '
+
';
+ return preg_replace('/\{\!\}/', '', $rv);
+ }
+
+ /**
+ * Returns all FileManager JavaScript templates as an array.
+ *
+ * @return array
+ */
+ public function filemanager_js_templates() {
+ $class_methods = get_class_methods($this);
+ $templates = array();
+ foreach ($class_methods as $method_name) {
+ if (preg_match('/^fm_js_template_(.*)$/', $method_name, $matches))
+ $templates[$matches[1]] = $this->$method_name();
+ }
+ return $templates;
+ }
+
+ /**
+ * Displays restrictions for the file manager
+ *
+ * @param form_filemanager $fm
+ * @return string
+ */
+ private function fm_print_restrictions($fm) {
+ $maxbytes = display_size($fm->options->maxbytes);
+ if (empty($options->maxfiles) || $options->maxfiles == -1) {
+ $maxsize = get_string('maxfilesize', 'moodle', $maxbytes);
+ //$string['maxfilesize'] = 'Maximum size for new files: {$a}';
+ } else {
+ $strparam = (object)array('size' => $maxbytes, 'attachments' => $options->maxfiles);
+ $maxsize = get_string('maxsizeandattachments', 'moodle', $strparam);
+ //$string['maxsizeandattachments'] = 'Maximum size for new files: {$a->size}, maximum attachments: {$a->attachments}';
+ }
+ // TODO MDL-32020 also should say about 'File types accepted'
+ return ''. $maxsize. '';
+ }
+
+ /**
+ * Template for FilePicker with general layout (not QuickUpload).
+ *
+ * Must have one top element containing everything else (recommended
),
+ * CSS for this element must define width and height of the filepicker window. Or CSS must
+ * define min-width, max-width, min-height and max-height and in this case the filepicker
+ * window will be resizeable;
+ *
+ * Element with class 'fp-viewbar' will have the class 'enabled' or 'disabled' when view mode
+ * can be changed or not;
+ * Inside element with class 'fp-viewbar' there are expected elements with classes
+ * 'fp-vb-icons', 'fp-vb-tree' and 'fp-vb-details'. They will handle onclick events to switch
+ * between the view modes, the last clicked element will have the class 'checked';
+ *
+ * Element with class 'fp-repo' is a template for displaying one repository. Other repositories
+ * will be attached as siblings (classes first/last/even/odd will be added respectfully).
+ * The currently selected repostory will have class 'active'. Contents of element with class
+ * 'fp-repo-name' will be replaced with repository name, source of image with class
+ * 'fp-repo-icon' will be replaced with repository icon;
+ *
+ * Element with class 'fp-content' is obligatory and will hold the current contents;
+ *
+ * Element with class 'fp-paging' will contain page navigation (will be deprecated soon);
+ *
+ * Element with class 'fp-path-folder' is a template for one folder in path toolbar.
+ * It will hold mouse click event and will be assigned classes first/last/even/odd respectfully.
+ * Parent element will receive class 'empty' when there are no folders to be displayed;
+ * The content of subelement with class 'fp-path-folder-name' will be substituted with folder name;
+ *
+ * Element with class 'fp-toolbar' will have class 'empty' if all 'Back', 'Search', 'Refresh',
+ * 'Logout', 'Manage' and 'Help' are unavailable for this repo;
+ *
+ * Inside fp-toolbar there are expected elements with classes fp-tb-back, fp-tb-search,
+ * fp-tb-refresh, fp-tb-logout, fp-tb-manage and fp-tb-help. Each of them will have
+ * class 'enabled' or 'disabled' if particular repository has this functionality.
+ * Element with class 'fp-tb-search' must contain empty form inside, it's contents will
+ * be substituted with the search form returned by repository (in the most cases it
+ * is generated with template core_repository_renderer::repository_default_searchform);
+ * Other elements must have either or
+
+
+
+
+
+
+
+
+
+
+
+
+
+';
+ return preg_replace('/\{\!\}/', '', $rv);
+ }
+
+ /**
+ * Returns all FilePicker JavaScript templates as an array.
+ *
+ * @return array
+ */
+ public function filepicker_js_templates() {
+ $class_methods = get_class_methods($this);
+ $templates = array();
+ foreach ($class_methods as $method_name) {
+ if (preg_match('/^fp_js_template_(.*)$/', $method_name, $matches))
+ $templates[$matches[1]] = $this->$method_name();
+ }
+ return $templates;
+ }
+
+ /**
+ * Returns HTML for default repository searchform to be passed to Filepicker
+ *
+ * This will be used as contents for search form defined in generallayout template
+ * (form with id {TOOLSEARCHID}).
+ * Default contents is one text input field with name="s"
+ */
+ public function repository_default_searchform() {
+ $str = '';
+ return $str;
+ }
+}
/**
* Data structure representing a general moodle file tree viewer
@@ -148,8 +964,9 @@ class files_tree_viewer implements renderable {
$fileitem = array(
'params' => $params,
'filename' => $child->get_visible_name(),
- 'filedate' => $filedate ? userdate($filedate) : '',
- 'filesize' => $filesize ? display_size($filesize) : ''
+ 'mimetype' => $child->get_mimetype(),
+ 'filedate' => $filedate ? $filedate : '',
+ 'filesize' => $filesize ? $filesize : ''
);
$url = new moodle_url('/files/index.php', $params);
if ($child->is_directory()) {
diff --git a/filter/glossary/yui/autolinker/autolinker.js b/filter/glossary/yui/autolinker/autolinker.js
index 46d04bca80f..e9af017e0ad 100644
--- a/filter/glossary/yui/autolinker/autolinker.js
+++ b/filter/glossary/yui/autolinker/autolinker.js
@@ -70,7 +70,8 @@ YUI.add('moodle-filter_glossary-autolinker', function(Y) {
this.overlay.hide(); //hide progress indicator
for (key in data.entries) {
- new M.core.alert({title:data.entries[key].concept, message:data.entries[key].definition, lightbox:false});
+ definition = data.entries[key].definition + data.entries[key].attachments
+ new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
}
return true;
diff --git a/grade/lib.php b/grade/lib.php
index 185fed52039..9d1bda94983 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -32,16 +32,56 @@ require_once $CFG->libdir.'/gradelib.php';
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class graded_users_iterator {
- public $course;
- public $grade_items;
- public $groupid;
- public $users_rs;
- public $grades_rs;
- public $gradestack;
- public $sortfield1;
- public $sortorder1;
- public $sortfield2;
- public $sortorder2;
+
+ /**
+ * The couse whose users we are interested in
+ */
+ protected $course;
+
+ /**
+ * An array of grade items or null if only user data was requested
+ */
+ protected $grade_items;
+
+ /**
+ * The group ID we are interested in. 0 means all groups.
+ */
+ protected $groupid;
+
+ /**
+ * A recordset of graded users
+ */
+ protected $users_rs;
+
+ /**
+ * A recordset of user grades (grade_grade instances)
+ */
+ protected $grades_rs;
+
+ /**
+ * Array used when moving to next user while iterating through the grades recordset
+ */
+ protected $gradestack;
+
+ /**
+ * The first field of the users table by which the array of users will be sorted
+ */
+ protected $sortfield1;
+
+ /**
+ * Should sortfield1 be ASC or DESC
+ */
+ protected $sortorder1;
+
+ /**
+ * The second field of the users table by which the array of users will be sorted
+ */
+ protected $sortfield2;
+
+ /**
+ * Should sortfield2 be ASC or DESC
+ */
+ protected $sortorder2;
/**
* Should users whose enrolment has been suspended be ignored?
@@ -59,7 +99,7 @@ class graded_users_iterator {
* @param string $sortfield2 The second field of the users table by which the array of users will be sorted
* @param string $sortorder2 The order in which the second sorting field will be sorted (ASC or DESC)
*/
- public function graded_users_iterator($course, $grade_items=null, $groupid=0,
+ public function __construct($course, $grade_items=null, $groupid=0,
$sortfield1='lastname', $sortorder1='ASC',
$sortfield2='firstname', $sortorder2='ASC') {
$this->course = $course;
@@ -75,6 +115,7 @@ class graded_users_iterator {
/**
* Initialise the iterator
+ *
* @return boolean success
*/
public function init() {
@@ -177,7 +218,7 @@ class graded_users_iterator {
* Returns information about the next user
* @return mixed array of user info, all grades and feedback or null when no more users found
*/
- function next_user() {
+ public function next_user() {
if (!$this->users_rs) {
return false; // no users present
}
@@ -244,10 +285,9 @@ class graded_users_iterator {
}
/**
- * Close the iterator, do not forget to call this function.
- * @return void
+ * Close the iterator, do not forget to call this function
*/
- function close() {
+ public function close() {
if ($this->users_rs) {
$this->users_rs->close();
$this->users_rs = null;
@@ -273,23 +313,23 @@ class graded_users_iterator {
/**
- * _push
+ * Add a grade_grade instance to the grade stack
*
* @param grade_grade $grade Grade object
*
* @return void
*/
- function _push($grade) {
+ private function _push($grade) {
array_push($this->gradestack, $grade);
}
/**
- * _pop
+ * Remove a grade_grade instance from the grade stack
*
- * @return object current grade object
+ * @return grade_grade current grade object
*/
- function _pop() {
+ private function _pop() {
global $DB;
if (empty($this->gradestack)) {
if (empty($this->grades_rs) || !$this->grades_rs->valid()) {
@@ -1049,6 +1089,7 @@ class grade_structure {
*/
public function get_element_icon(&$element, $spacerifnone=false) {
global $CFG, $OUTPUT;
+ require_once $CFG->libdir.'/filelib.php';
switch ($element['type']) {
case 'item':
@@ -1114,7 +1155,7 @@ class grade_structure {
case 'category':
$strcat = get_string('category', 'grades');
- return '';
}
diff --git a/group/externallib.php b/group/externallib.php
index b0e7ce9077a..9045afd702f 100644
--- a/group/externallib.php
+++ b/group/externallib.php
@@ -95,8 +95,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
@@ -168,8 +167,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
@@ -231,8 +229,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $params['courseid'];
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
@@ -310,8 +307,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
@@ -369,8 +365,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
@@ -450,8 +445,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
@@ -529,8 +523,7 @@ class core_group_external extends external_api {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
- throw new moodle_exception(
- get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
+ throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam);
}
require_capability('moodle/course:managegroups', $context);
diff --git a/install/lang/ar/admin.php b/install/lang/ar/admin.php
index cd5cf168aa3..a5496914a7f 100644
--- a/install/lang/ar/admin.php
+++ b/install/lang/ar/admin.php
@@ -36,7 +36,7 @@ $string['cliincorrectvalueerror'] = 'خطأ، القيمة "{$a->value}" غير
$string['cliincorrectvalueretry'] = 'قيمة غير صحيحة، حاول مرة أخرى';
$string['clitypevalue'] = 'أدخل القيمة';
$string['clitypevaluedefault'] = 'ادخل القيم أو اضغط انتر (Enter) لإستخدام القيم الأفتراضية ({$a})';
-$string['cliunknowoption'] = 'خيارات غير معروفة
+$string['cliunknowoption'] = 'خيارات غير معروفة
{$a}
الرجاء استخدام خيار المساعدة';
$string['cliyesnoprompt'] = 'ادخل (Y) تعني نعم أو (N) تعني لأ';
diff --git a/install/lang/ast/install.php b/install/lang/ast/install.php
index 0c21e014975..d0a60ba1cad 100644
--- a/install/lang/ast/install.php
+++ b/install/lang/ast/install.php
@@ -44,10 +44,10 @@ $string['memorylimithelp'] = '
La llende de memoria del PHP del so servidor ta
Esto va facer que Moodle tenga problemes de memoria más tarde, especialmente si tien munchos módulos y/o munchos usuarios.
-
Recomendamos que configure PHP con una llende más grande si ye posible, como por exemplu 40M.
+
Recomendamos que configure PHP con una llende más grande si ye posible, como por exemplu 40M.
Esisten varies formes nes que pue intentar facer esta modificación:
-
Si pue, recompile PHP con --enable-memory-limit.
+
Si pue, recompile PHP con --enable-memory-limit.
Esto va permitir que\'l propiu Moodle modifique la llende de memoria.
Si tien accesu al so ficheru php.ini pue modificar el valor de memory_limit a daqué paecío a 40M. Si nun tien accesu a esi ficheru igual pue pidir al alministrador del sistema que lo faiga.
En dellos servidores PHP pue crear un ficheru .htaccess nel direutoriu Moodle cola ringlera que vien darréu:
diff --git a/install/lang/az/admin.php b/install/lang/az/admin.php
index 49b0e3072f0..310d4dda90c 100644
--- a/install/lang/az/admin.php
+++ b/install/lang/az/admin.php
@@ -36,7 +36,7 @@ $string['cliincorrectvalueerror'] = 'Səhv, "{$a->option}" üçün səhv "{$a->v
$string['cliincorrectvalueretry'] = 'Səhv, "{$a->option}" üçün səhv "{$a->value}" qiyməti';
$string['clitypevalue'] = 'Qiyməti daxil edin';
$string['clitypevaluedefault'] = 'Qiyməti daxil edin, ({$a}) qiymətindən avtomatik olaraq istifadə etmək üçün Enter düyməsini basın';
-$string['cliunknowoption'] = 'Təyin olunmayan parametrlər:
+$string['cliunknowoption'] = 'Təyin olunmayan parametrlər:
{$a}
Zəhmət olmasa help parametrindən istifadə edin';
$string['cliyesnoprompt'] = 'y (bəli) və n (xeyr) düyməsini basın';
diff --git a/install/lang/az/install.php b/install/lang/az/install.php
index 65c5e2d7f23..1611a804925 100644
--- a/install/lang/az/install.php
+++ b/install/lang/az/install.php
@@ -70,23 +70,23 @@ $string['pathsroparentdataroot'] = '({$a->parent}) valideyn kataloquna yazmaq m
$string['pathssubadmindir'] = 'Veb-hostinqlərin sayı az olduqda yol/admin idarəetmə panelinə və ya digər bir yerə keçmək üçün xüsusi URL-dir. Təəssüf ki, bu Moodlun idarəetmə səhifələrinin standart mövqeyi ilə ziddiyyət təşkil edir. Bunu Moodle kataloqunda admin qovluğunun adını dəyişməklə və burada yeni adı göstərməklə aradan qaldırmaq olar. Məsələn, moodleadmin. Bu zaman Moodlun idarəetmə panelinə bütün keçidlər avtomatik olaraq dəyişir.';
$string['pathssubdataroot'] = 'Moodlun yüklənmiş faylları harada saxlayacağını mütləq göstərmək lazımdır Veb-server istifadəçisinin (usually \'nobody\' or \'apache\') bu kataloqda oxuma və YAZMA üçün icazəsi olmalıdır, lakin bu zaman İnternetdən birbaşa müraciət mümkün ola bilməz. Əgər bu kataloq mövcud deyilsə, quraşdırma proqramı onu yaratmağa cəhd edir. ';
$string['pathssubdirroot'] = 'Moodlun quraşdırılması kataloquna tam yol';
-$string['pathssubwwwroot'] = 'Moodla keçidin mümkün olduğu tam veb-ünvan.
-Moodla keçid üçün bir neçə ünvandan istifadə etmək mümkün deyil. Əgər sizin saytın bir neçə açıq ünvanı varsa, siz həmişə bu ünvanlardan göstərilən ünvana keçidi təmin etməlisiniz.
-əgəgr sizin sayta həm İnternetdən və həm də lokal şəbəkədən keçid mümkündürsə, burada ümumi ünvanı göstərin və DNS-i elə sazlayın ki, lokal istifadəçilər də bu ünvandan istifadə edə bilsin.
-Əgər göstərilən ünvan düzgün deyilsə, quraşdırmanı digər qiymətlə yenidən başlamaq üçün brauzerin ünvan sətirində URL-i dəyişin. ';
+$string['pathssubwwwroot'] = 'Moodla keçidin mümkün olduğu tam veb-ünvan.
+Moodla keçid üçün bir neçə ünvandan istifadə etmək mümkün deyil. Əgər sizin saytın bir neçə açıq ünvanı varsa, siz həmişə bu ünvanlardan göstərilən ünvana keçidi təmin etməlisiniz.
+əgəgr sizin sayta həm İnternetdən və həm də lokal şəbəkədən keçid mümkündürsə, burada ümumi ünvanı göstərin və DNS-i elə sazlayın ki, lokal istifadəçilər də bu ünvandan istifadə edə bilsin.
+Əgər göstərilən ünvan düzgün deyilsə, quraşdırmanı digər qiymətlə yenidən başlamaq üçün brauzerin ünvan sətirində URL-i dəyişin.';
$string['pathsunsecuredataroot'] = 'Verilənlər kataloqunun mövqeyi təhlükəsizlik tələblərinə cavab vermir.';
$string['pathswrongadmindir'] = 'Admin kataloqu mövcud deyil';
$string['phpextension'] = '{$a} PHP geniçlənməsi';
$string['phpversion'] = 'PHP versiyası';
-$string['phpversionhelp'] = '
Moodle üçün PHP-nin 4.3.0 və ondan yuxarı və ya 5.1.0 və ondan yuxarı versiyaları(5.0.versiyasının bəzi problemləri məlumdur) lazımdır.
-
İndi Siz, {$a} versiyasından istifadə edirsiniz
-
Siz PHP-ni yeniləməlisiniz və ya PHP-nin daha yeni versiyası olan xostinqə keçməlisiniz!
+$string['phpversionhelp'] = '
Moodle üçün PHP-nin 4.3.0 və ondan yuxarı və ya 5.1.0 və ondan yuxarı versiyaları(5.0.versiyasının bəzi problemləri məlumdur) lazımdır.
+
İndi Siz, {$a} versiyasından istifadə edirsiniz
+
Siz PHP-ni yeniləməlisiniz və ya PHP-nin daha yeni versiyası olan xostinqə keçməlisiniz!
(5.0.x verisyası olarsa 4.4.x versiyasına qayıda bilərsiniz)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Siz bu səhifəni ona görə görürsünüz ki, {$a->packname} {$a->packversion} proqram paketini öz kompyüterinizdə müvəffəqiyyətlə qurmusunuz. Təbrik edirik!';
$string['welcomep30'] = '{$a->installername} proqram paketinin bu versiyasında Moodleun işləyəcəyi mühiti yaratmaq üçün aşağıdakı proqramlar var:';
$string['welcomep40'] = 'Paketə həmçinin Moodle {$a->moodlerelease} ({$a->moodleversion}) daxildir.';
-$string['welcomep50'] = 'Bu paketə daxil olan əlavələrdən istifadə edilmə ardıcıllığı, müvafiq lisenziyalarla müəyyən edilir. {$a->installername} tam proqram paketi
+$string['welcomep50'] = 'Bu paketə daxil olan əlavələrdən istifadə edilmə ardıcıllığı, müvafiq lisenziyalarla müəyyən edilir. {$a->installername} tam proqram paketi
mənbəni açır və GPL lisenziyasının şərtlərinə uyğun olaraq yayılır.';
$string['welcomep60'] = 'Növbəti səhifələrdə Siz, bir neçə sadə addımla öz kompyüterinizdə Moodle-un parametrlərini sazlaya və quraşdıra bilərsiniz. Siz sazlama parametrlərini susmaya görə qəbul edə və ya öz tələblərinizdən asılı olaraq dəyişə bilərsiniz.';
$string['welcomep70'] = 'Moodle quraşdırma prosesini davam etmək üçün "Növbəti" düyməsini sıxın.';
diff --git a/install/lang/ca/admin.php b/install/lang/ca/admin.php
index ffb19b6cb7e..01a0d35cb8a 100644
--- a/install/lang/ca/admin.php
+++ b/install/lang/ca/admin.php
@@ -36,7 +36,7 @@ $string['cliincorrectvalueerror'] = 'Error, valor incorrecte "{$a->value}" per a
$string['cliincorrectvalueretry'] = 'Valor incorrecte, si us plau, torneu-ho a provar.';
$string['clitypevalue'] = 'Valor de tipus';
$string['clitypevaluedefault'] = 'valor de tipus, premeu Intro per fer servir un valor per defecte ({$a})';
-$string['cliunknowoption'] = 'Opcions invàlides:
+$string['cliunknowoption'] = 'Opcions invàlides:
{$a}
L\'opció --help us orientarà.';
$string['cliyesnoprompt'] = 'Escriu y (significa Sí) o n (significa No)';
diff --git a/install/lang/ca/install.php b/install/lang/ca/install.php
index 6294519797f..d57d69d67c3 100644
--- a/install/lang/ca/install.php
+++ b/install/lang/ca/install.php
@@ -64,8 +64,8 @@ $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Esteu veient aquesta pàgina perquè heu instal·lat amb èxit i heu executat el paquet {$a->packname} {$a->packversion}. Felicitacions!';
$string['welcomep30'] = 'Aquesta versió de {$a->installername} inclou les aplicacions necessàries per crear un entorn en el qual funcioni Moodle:';
$string['welcomep40'] = 'El paquet inclou també Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'L\'ús de totes les aplicacions d\'aquest paquet és governat per les seves llicències respectives. El paquet {$a->installername} complet és
-codi font obert i es distribueix
+$string['welcomep50'] = 'L\'ús de totes les aplicacions d\'aquest paquet és governat per les seves llicències respectives. El paquet {$a->installername} complet és
+codi font obert i es distribueix
sota llicència GPL.';
$string['welcomep60'] = 'Les pàgines següents us guiaran per una sèrie de passos fàcils de seguir per configurar Moodle en el vostre ordinador. Podeu acceptar els paràmetres per defecte o, opcionalment, modificar-los perquè s\'ajustin a les vostres necessitats.';
$string['welcomep70'] = 'Feu clic en el botó "Següent" per continuar la configuració de Moodle.';
diff --git a/install/lang/cy/install.php b/install/lang/cy/install.php
index 08593603419..5b0f627e34c 100644
--- a/install/lang/cy/install.php
+++ b/install/lang/cy/install.php
@@ -42,21 +42,21 @@ $string['installation'] = 'Gosod';
$string['langdownloaderror'] = 'Yn anffodus, ni osodwyd yr iaith ganlynol: "{$a}". Bydd y broses osod yn cario ymlaen yn Saesneg.';
$string['memorylimithelp'] = '
Mae maint y cof PHP yn eich gweinydd ar hyn o bryd yn {$a}.
-
Gall hyn arwain at broblemau â\'r cof yn nes ymlaen, yn enwedig
+
Gall hyn arwain at broblemau â\'r cof yn nes ymlaen, yn enwedig
os ydych wedi galluogi llawer o fodiwlau a/neu lawer o ddefnyddwyr.
-
Rydym yn argymell eich bod yn ffurfweddu PHP gyda mwy o gof os yn bosib, megis 40M.
+
Rydym yn argymell eich bod yn ffurfweddu PHP gyda mwy o gof os yn bosib, megis 40M.
Mae sawl ffordd o wneud hyn:
-
Os ydych yn gallu, ceisiwch ail-grynhoi PHP gyda --enable-memory-limit.
+
Os ydych yn gallu, ceisiwch ail-grynhoi PHP gyda --enable-memory-limit.
Bydd hyn yn gadael i Moodle osod maint y cof ei hun.
-
Os ydych yn gallu mynd i mewn i\'ch ffeil php.ini, gallwch newid y gosodiad memory_limit
- yn y fan honno i tua 40M. Os nad ydych chi\'n gallu gwneud hyn eich hun, efallai
+
Os ydych yn gallu mynd i mewn i\'ch ffeil php.ini, gallwch newid y gosodiad memory_limit
+ yn y fan honno i tua 40M. Os nad ydych chi\'n gallu gwneud hyn eich hun, efallai
y gallech ofyn i\'ch gweinyddwr wneud hyn i chi.
-
Ar rai gweinyddion PHP, gallwch greu ffeil .htaccess yng nghyfeiriadur Moodle
+
Ar rai gweinyddion PHP, gallwch greu ffeil .htaccess yng nghyfeiriadur Moodle
sy\'n cynnwys y llinell hon:
php_value memory_limit 40M
-
Fodd bynnag, ar rai gweinyddion bydd hyn yn atal pob tudalen PHP rhag gweithio
+
Fodd bynnag, ar rai gweinyddion bydd hyn yn atal pob tudalen PHP rhag gweithio
(bydd gwallau\'n ymddangos pan fyddwch yn edrych ar dudalennau) felly bydd rhaid i chi dynnu\'r ffeil .htaccess file.
Rhaid i chi uwchraddio PHP neu newid i westeiwr â fersiwn diweddarach o PHP!
(Os oes gennych 5.0.x gallwch hefyd is-raddio i fersiwn 4.4.x)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
-$string['welcomep20'] = 'Rydych chi\'n gweld y dudalen hon gan eich bod wedi gosod a
+$string['welcomep20'] = 'Rydych chi\'n gweld y dudalen hon gan eich bod wedi gosod a
lansio\'r pecyn {$a->packname} {$a->packversion} yn llwyddiannus ar eich cyfrifiadur. Llongyfarchiadau!';
-$string['welcomep30'] = 'Mae\'r fersiwn {$a->installername} yn cynnwys rhaglenni
+$string['welcomep30'] = 'Mae\'r fersiwn {$a->installername} yn cynnwys rhaglenni
i greu amgylchedd y gall Moodle weithio ynddo, sef:';
$string['welcomep40'] = 'Mae\'r pecyn hefyd yn cynnwys Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'Y trwyddedau perthnasol sy\'n llywodraethu dros yr holl raglenni yn y pecyn hwn. Y pecyn cyflawn yw {$a->installername}
+$string['welcomep50'] = 'Y trwyddedau perthnasol sy\'n llywodraethu dros yr holl raglenni yn y pecyn hwn. Y pecyn cyflawn yw {$a->installername}open source a chaiff ei ddosbarthu dan y drwydded GPL.';
-$string['welcomep60'] = 'Bydd y tudalennau canlynol yn eich arwain drwy\'r camau syml i
- ffurfweddu a gosod Moodle ar eich cyfrifiadur. Gallwch ddewis derbyn y gosodiadau
+$string['welcomep60'] = 'Bydd y tudalennau canlynol yn eich arwain drwy\'r camau syml i
+ ffurfweddu a gosod Moodle ar eich cyfrifiadur. Gallwch ddewis derbyn y gosodiadau
diofyn, neu gallwch eu newid eich hun ar gyfer eich dibenion chi.';
$string['welcomep70'] = 'Cliciwch y botwm "Nesaf" i fwrw ymlaen i osod Moodle.';
$string['wwwroot'] = 'Cyfeiriad ar y we';
diff --git a/install/lang/da/install.php b/install/lang/da/install.php
index c746a8b68ee..e85ebfaa632 100644
--- a/install/lang/da/install.php
+++ b/install/lang/da/install.php
@@ -48,21 +48,21 @@ Installationsprogrammet udfører et tjek før hver installation og opgradering.
$string['errorsinenvironment'] = 'Systemtjekket mislykkedes!';
$string['installation'] = 'Installation';
$string['langdownloaderror'] = 'Sproget "{$a}" blev desværre ikke installeret. Installationen vil fortsætte på engelsk.';
-$string['memorylimithelp'] = '
Den mængde hukommelse PHP kan bruge, er sat til {$a}.
+$string['memorylimithelp'] = '
Den mængde hukommelse PHP kan bruge, er sat til {$a}.
-
Dette kan forårsage at der opstår problemer senere, især hvis du har mange moduler aktiveret eller mange brugere.
+
Dette kan forårsage at der opstår problemer senere, især hvis du har mange moduler aktiveret eller mange brugere.
-
Vi anbefaler at du konfigurerer PHP med mere hukommelse, f.eks. 40M.
-Der er flere måder hvorpå du kan rette det.
-
-
Hvis du har mulighed for det, kan du rekompilere PHP med --enable-memory-limit.
-Det vil tillade at Moodle selv kan definere hvor meget hukommelse der er brug for.
+
Vi anbefaler at du konfigurerer PHP med mere hukommelse, f.eks. 40M.
+Der er flere måder hvorpå du kan rette det.
+
+
Hvis du har mulighed for det, kan du rekompilere PHP med --enable-memory-limit.
+Det vil tillade at Moodle selv kan definere hvor meget hukommelse der er brug for.
-
Hvis du har adgang til php.ini filen kan du ændre memory_limit-indstillingen til noget i retning af 40M.
-Hvis du ikke har direkte adgang til den kan du bede systemadministratoren om at gøre det for dig.
+
Hvis du har adgang til php.ini filen kan du ændre memory_limit-indstillingen til noget i retning af 40M.
+Hvis du ikke har direkte adgang til den kan du bede systemadministratoren om at gøre det for dig.
På nogle servere kan du oprette en \'.htaccess\' fil og gemme den i moodle-mappen med linjen:
-
php_value memory_limit 40M
+
php_value memory_limit 40M
Det kan dog på nogle servere forhindre alle PHP-siderne i at virke (du vil se fejl når du ser på siderne). I så fald kan du blive nødt til at fjerne \'.htaccess\' filen igen.
';
$string['paths'] = 'Stier';
$string['pathserrcreatedataroot'] = 'Datamappen ({$a->dataroot}) kan ikke oprettes af installationsprogrammet.';
@@ -72,19 +72,18 @@ $string['pathsroparentdataroot'] = 'Den overordnede mappe ({$a->parent}) er skri
$string['pathssubadmindir'] = 'Enkelte webhoteller bruger /admin som speciel URL til kontrolpanelet el. lign. Desværre konflikter det med Moodles standardplacering af admin-sider. Du kan klare dette ved at give admin-mappen et andet navn i din installation og skrive det her. Det kan f.eks. være moodleadmin. Det vil fikse admin-links i Moodle.';
$string['pathssubdataroot'] = 'Du har brug for et sted, hvor Moodle kan gemme uploadede filer. Denne mappe skal kunne læses OG SKRIVES I af webserverbrugeren (oftest \'ingen\' eller \'apache\'), men må ikke være tilgængelig direkte via internettet. Installationsprogrammet vil forsøge at oprette mappen, hvis ikke den allerede eksisterer.';
$string['pathssubdirroot'] = 'Den fulde sti til Moodleinstallationen.';
-$string['pathssubwwwroot'] = 'Moodles fulde web-adresse.
+$string['pathssubwwwroot'] = 'Moodles fulde web-adresse.
Det er ikke muligt at komme ind på Moodle fra mere end en adresse.
Hvis dit websted har flere offentlige adresser skal du opsætte permanent viderestilling til dem alle undtagen denne.
Hvis dit websted er tilgængeligt fra både internet og intranet skal du bruge internetadressen her og opsætte din DNS sådan at intranet-brugerne kan bruge den offentlige adresse også.
-Hvis ikke adressen er korrekt må du ændre URL\'en i din browser og genstarte installationen med den rigtige adresse.
-';
+Hvis ikke adressen er korrekt må du ændre URL\'en i din browser og genstarte installationen med den rigtige adresse.';
$string['pathsunsecuredataroot'] = 'Datamappen er ikke sikret';
$string['pathswrongadmindir'] = 'Adminmappe eksisterer ikke';
$string['phpextension'] = '{$a} PHP-extension';
$string['phpversion'] = 'PHP version';
-$string['phpversionhelp'] = '
Moodle kræver mindst PHP version 4.3.0. eller 5.1.0 (5.0.x er behæftet med fejl).
-
Webserveren bruger i øjeblikket version {$a}
-
Du bliver nødt til at opdatere PHP eller flytte systemet over på en anden webserver der har en nyere version af PHP!
+$string['phpversionhelp'] = '
Moodle kræver mindst PHP version 4.3.0. eller 5.1.0 (5.0.x er behæftet med fejl).
+
Webserveren bruger i øjeblikket version {$a}
+
Du bliver nødt til at opdatere PHP eller flytte systemet over på en anden webserver der har en nyere version af PHP!
(Har du ver. 5.0.x kan du også nedgradere til 4.4.x)';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Du ser denne side fordi du med succes har installeret og åbnet pakken {$a->packname} {$a->packversion} på din computer.
diff --git a/install/lang/de/admin.php b/install/lang/de/admin.php
index ceff3da3116..f5b781cbffb 100644
--- a/install/lang/de/admin.php
+++ b/install/lang/de/admin.php
@@ -36,7 +36,7 @@ $string['cliincorrectvalueerror'] = 'Fehler: Falscher Wert "{$a->value}" für "{
$string['cliincorrectvalueretry'] = 'Falscher Wert - bitte nochmal';
$string['clitypevalue'] = 'Wert eingeben';
$string['clitypevaluedefault'] = 'Wert eingeben oder Standardwert benutzen ({$a})';
-$string['cliunknowoption'] = 'Nicht erkannte Optionen:
+$string['cliunknowoption'] = 'Nicht erkannte Optionen:
{$a}
Hilfe wird über die Option -help angezeigt.';
$string['cliyesnoprompt'] = 'y (yes=ja) oder n (no=nein) eingeben';
diff --git a/install/lang/de/install.php b/install/lang/de/install.php
index c1a2188dd90..3484e7a88f2 100644
--- a/install/lang/de/install.php
+++ b/install/lang/de/install.php
@@ -66,7 +66,7 @@ $string['pathsroparentdataroot'] = 'Das Verzeichnis ({$a->parent}) ist schreibge
$string['pathssubadmindir'] = 'Einige Webserver benutzen /admin als speziellen Link, um auf Einstellungsseiten oder Ähnliches zu verweisen. Unglücklicherweise kollidiert dies mit dem standardmäßigen Verzeichnis für die Moodle-Administration. Sie können dieses Problem beheben, indem Sie das Verzeichnis admin in Ihrer Moodle-Installation umbenennen und den neuen Namen hier eingeben (z.B. moodleadmin). Mit dieser Änderung werden alle Admin-Links korrigiert.';
$string['pathssubdataroot'] = 'Sie benötigen einen Platz, wo Moodle hochgeladene Dateien abspeichern kann. Dieses Verzeichnis muss Lese- und Schreibrechte für das Nutzerkonto besitzen, mit dem Ihr Webservers läuft (üblicherweise \'nobody\', \'apache\' oder \'www\'). Außerdem sollte das Verzeichnis nicht direkt aus dem Internet erreichbar sein. Das Intallationsskript wird versuchen, ein solches Verzeichnis zu erstellen, falls es nicht existiert.';
$string['pathssubdirroot'] = 'Vollständiger Pfad der Moodle-Installation';
-$string['pathssubwwwroot'] = 'Vollständige Webadresse für den Zugriff auf Moodle. Es ist nicht möglich, über unterschiedliche Adressen auf Moodle zuzugreifen. Sollte Ihre Website mehrere öffentliche Adressen verwenden, so müssen Sie eine Adresse festlegen und für die übrigen Adressen dauerhafte Weiterleitungen dorthin einrichten.
+$string['pathssubwwwroot'] = 'Vollständige Webadresse für den Zugriff auf Moodle. Es ist nicht möglich, über unterschiedliche Adressen auf Moodle zuzugreifen. Sollte Ihre Website mehrere öffentliche Adressen verwenden, so müssen Sie eine Adresse festlegen und für die übrigen Adressen dauerhafte Weiterleitungen dorthin einrichten.
Falls Ihre Website gleichzeitig im Intranet und im Internet erreichbar ist, so tragen Sie die öffentliche Adresse ein. Konfigurieren Sie den DNS so, dass Moodle auch aus dem Intranet über die öffentliche Adresse erreichbar ist.
Führen Sie Ihre Moodle-Installation unbedingt mit der richtigen Adresse durch, weil es andernfalls zu Problemen kommen könnte.';
$string['pathsunsecuredataroot'] = 'Der Speicherort des Verzeichnisses \'dataroot\' ist unsicher';
diff --git a/install/lang/es/install.php b/install/lang/es/install.php
index caf44907a1f..750165db5e4 100644
--- a/install/lang/es/install.php
+++ b/install/lang/es/install.php
@@ -81,17 +81,17 @@ $string['phpextension'] = 'Extensión PHP {$a}';
$string['phpversion'] = 'Versión PHP';
$string['phpversionhelp'] = '
Moodle requiere al menos una versión de PHP 4.3.0 o 5.1.0 ((5.0.x tiene una serie de problemas conocidos).
En este momento está ejecutando la versión {$a}
-
¡Debe actualizar PHP o trasladarse a otro servidor con una versión más reciente de PHP!
+
¡Debe actualizar PHP o trasladarse a otro servidor con una versión más reciente de PHP!
(En caso de 5.0.x podría también revertir a la versión 4.4.x)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Si está viendo esta página es porque ha podido ejecutar el paquete {$a->packname} {$a->packversion} en su ordenador. !Enhorabuena!';
-$string['welcomep30'] = 'Esta versión de {$a->installername} incluye las
+$string['welcomep30'] = 'Esta versión de {$a->installername} incluye las
aplicaciones necesarias para que Moodle funcione en su ordenador,
principalmente:';
$string['welcomep40'] = 'El paquete también incluye Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'El uso de todas las aplicaciones del paquete está gobernado por sus respectivas
- licencias. El programa {$a->installername} es
- código abierto y se distribuye
+$string['welcomep50'] = 'El uso de todas las aplicaciones del paquete está gobernado por sus respectivas
+ licencias. El programa {$a->installername} es
+ código abierto y se distribuye
bajo licencia GPL.';
$string['welcomep60'] = 'Las siguientes páginas le guiarán a través de algunos sencillos pasos para configurar
y ajustar Moodle en su ordenador. Puede utilizar los valores por defecto sugeridos o,
diff --git a/install/lang/es_mx/admin.php b/install/lang/es_mx/admin.php
new file mode 100644
index 00000000000..c50bbe74117
--- /dev/null
+++ b/install/lang/es_mx/admin.php
@@ -0,0 +1,33 @@
+.
+
+/**
+ * Automatically generated strings for Moodle 2.3dev installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package installer
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['environmentrequireinstall'] = 'debe estar instalado y activado';
diff --git a/install/lang/es_mx/install.php b/install/lang/es_mx/install.php
new file mode 100644
index 00000000000..a3586f021e3
--- /dev/null
+++ b/install/lang/es_mx/install.php
@@ -0,0 +1,38 @@
+.
+
+/**
+ * Automatically generated strings for Moodle 2.3dev installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package installer
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['databasehost'] = 'host de la Base de Datos';
+$string['environmentsub2'] = 'Cada versión de Moodle tiene algún requisito mínimo de la versión de PHP y un número obligatorio de extensiones de PHP. Una comprobación del entorno completo se realiza antes de cada instalación y actualización. Por favor, póngase en contacto con el administrador del servidor si no sabe cómo instalar la nueva versión o habilitar las extensiones PHP.';
+$string['errorsinenvironment'] = '¡La comprobación del entorno falló!';
+$string['welcomep20'] = 'Si está viendo esta página es porque ha podido ejecutar el paquete {$a->packname} {$a->packversion} en su computadora. !Enhorabuena!';
+$string['welcomep30'] = 'Esta versión de {$a->installername} incluye las aplicaciones necesarias para que Moodle funcione en su computadora principalmente:';
+$string['welcomep60'] = 'Las siguientes páginas le guiarán a través de algunos sencillos pasos para configurar y ajustar Moodle en su computadora. Puede utilizar los valores por defecto sugeridos o, de forma opcional, modificarlos para que se ajusten a sus necesidades.';
diff --git a/install/lang/et/admin.php b/install/lang/et/admin.php
index 7a183b8e64e..cae3554ab34 100644
--- a/install/lang/et/admin.php
+++ b/install/lang/et/admin.php
@@ -36,7 +36,7 @@ $string['cliincorrectvalueerror'] = 'Viga, vigane väärtus "{$a->value}" "{$a->
$string['cliincorrectvalueretry'] = 'Vale väärtus(value), palun proovige uuesti';
$string['clitypevalue'] = 'tüübi väärtus';
$string['clitypevaluedefault'] = 'sisesta väärtus, vajuta Enter kasutamaks vaikeväärtust ({$a})';
-$string['cliunknowoption'] = 'Tundmatud valikud:
+$string['cliunknowoption'] = 'Tundmatud valikud:
{$a}
Palun kasuta --help valikut.';
$string['cliyesnoprompt'] = 'kirjuta y (tähendab jah) või n (tähendab ei)';
diff --git a/install/lang/eu/install.php b/install/lang/eu/install.php
index 4f7b57e26ed..682ee9b1108 100644
--- a/install/lang/eu/install.php
+++ b/install/lang/eu/install.php
@@ -75,13 +75,13 @@ $string['phpversionhelp'] = '
Moodle-k PHP 4.1.0 edo geroagoko bertsioa behar
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Orri hau ikusten baduzu {$a->packname} {$a->packversion} paketea
zure ordenadorean instalatu ahal izan duzu. Zorionak!';
-$string['welcomep30'] = '{$a->installername}ren bertsio honek Moodlek
+$string['welcomep30'] = '{$a->installername}ren bertsio honek Moodlek
zure ordenadorean funtzionatzeko behar diren aplikazioak dauzka,
bereziki:';
$string['welcomep40'] = 'Paketeak ere zera dauka: Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'Paketeko aplikazio guztien erabilpena dagozkien lizentziek
- arautzen dute. {$a->installername} aplikazioak
- kode irekia dauka eta
+$string['welcomep50'] = 'Paketeko aplikazio guztien erabilpena dagozkien lizentziek
+ arautzen dute. {$a->installername} aplikazioak
+ kode irekia dauka eta
GPL lizentziapean banatzen da.';
$string['welcomep60'] = 'Datozen orriek urrats erraz batzuen bidez gidatuko zaituzte
Moodle zure ordenadorean instalatu eta konfiguratzeko. Aholkatzen diren lehentsitako baloreak
diff --git a/install/lang/gl/install.php b/install/lang/gl/install.php
index 2d3518df35e..b1cd753ef06 100644
--- a/install/lang/gl/install.php
+++ b/install/lang/gl/install.php
@@ -44,10 +44,10 @@ $string['memorylimithelp'] = '
O límite de memoria para PHP do seu servidor e
Isto fará que Moodle teña problemas de memoria máis tarde, especialmente se ten un número de módulos significativo e/ou un gran número de usuarios.
-
Recomendamos que configure PHP cun límite maior se é posible, como por exemplo 16M.
+
Recomendamos que configure PHP cun límite maior se é posible, como por exemplo 16M.
Existen varias formas que pode tentar para facer esta modificación:
-
Se pode, recompile PHP con --enable-memory-limit.
+
Se pode, recompile PHP con --enable-memory-limit.
Iso permitirá que o propio Moodle modifique o límite de memoria.
Se ten acceso ao seu ficheiro php.ini pode modificar o valor de memory_limit para algo semellante a 16M. Se non ten acceso a ese ficheiro tal vez poida pedir ao administrador do sistema que o faga.
Nalgúns servidores PHP servers pode crear un ficheiro .htaccess no directorio Moodle coa liña seguinte:
@@ -61,7 +61,7 @@ $string['phpversionhelp'] = '
Moodle require unha versión de PHP de 4.3.0 com
(No caso de ter unha versión 5.0.x pode retornar para unha versión 4.4.x)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Está a ver esta páxina porque conseguiu instalar e iniciar o paquete {$a->packname} {$a->packversion} no seu computador. Parabéns!';
-$string['welcomep30'] = 'Esta versión do {$a->installername} inclúe as aplicacións
+$string['welcomep30'] = 'Esta versión do {$a->installername} inclúe as aplicacións
para crear o ámbito en que Moodle pode funcionar, nomeadamente:';
$string['welcomep40'] = 'O paquete tamén inclúe Moodle {$a->moodlerelease} ({$a->moodleversion}).';
$string['welcomep50'] = 'A utilización de todas as aplicacións deste paquete réxese polas respectivas licenzas. O paquete {$a->installername} completo é código aberto distribuído nos termos da licenza GPL.';
diff --git a/install/lang/he/admin.php b/install/lang/he/admin.php
index 5baee6027b6..eb6550f00dd 100644
--- a/install/lang/he/admin.php
+++ b/install/lang/he/admin.php
@@ -37,7 +37,7 @@ $string['cliincorrectvalueerror'] = 'שגיאה: ערך לא תקין
$string['cliincorrectvalueretry'] = 'ערך שגוי, נסה שנית';
$string['clitypevalue'] = 'סוג הערך';
$string['clitypevaluedefault'] = 'סוג הערך, הקש Enter לשימוש בערך ברירת מחדל ({$a})';
-$string['cliunknowoption'] = 'אפשרויות לא מוכרות :
+$string['cliunknowoption'] = 'אפשרויות לא מוכרות :
{$a}
אנא השתמש באפשרות העזרה.';
$string['cliyesnoprompt'] = 'רשום y (שפרושו כן) או n (שפרושו לא)';
diff --git a/install/lang/he/install.php b/install/lang/he/install.php
index a756854938a..e107fcdc05d 100644
--- a/install/lang/he/install.php
+++ b/install/lang/he/install.php
@@ -79,8 +79,8 @@ $string['paths'] = 'נתיבים';
$string['pathserrcreatedataroot'] = 'ספריית המידע (Data Directory) - ({$a->dataroot}) לא יכולה להיווצר על-ידי המתקין.';
$string['pathshead'] = 'נתיבים מאושרים';
$string['pathsrodataroot'] = 'ספריית המידע (Data Directory) לא ניתנת לכתיבה.';
-$string['pathsroparentdataroot'] = 'ספריית האב - ({$a->parent}) לא ניתנת לכתיבה.
-ספריית המידע (Data Directory) - ({$a->dataroot}) לא יכולה להיווצר על-ידי המתקין. ';
+$string['pathsroparentdataroot'] = 'ספריית האב - ({$a->parent}) לא ניתנת לכתיבה.
+ספריית המידע (Data Directory) - ({$a->dataroot}) לא יכולה להיווצר על-ידי המתקין.';
$string['pathssubdirroot'] = 'הנתיב המלא לספריית ההתקנה של Moodle';
$string['pathsunsecuredataroot'] = 'ספריית המידע (Data Directory) לא מאובטחת';
$string['pathswrongadmindir'] = 'ספריית ה-admin לא קיימת';
@@ -96,11 +96,11 @@ $string['welcomep20'] = 'הינך רואה את עמוד זה מפני שהתק
חבילה במחשבך. ברכותינו!';
$string['welcomep30'] = 'גירסת {$a->installername} כוללת את היישומים ליצור סביבה אשר בה Moodle
יפעל דהיינו:';
-$string['welcomep40'] = 'החבילה כוללת בנוסף
+$string['welcomep40'] = 'החבילה כוללת בנוסף
Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'השימוש בכל היישומים בחבילה זו מפוקח ע"י הרשיונות המתאימים להם. החבילה
+$string['welcomep50'] = 'השימוש בכל היישומים בחבילה זו מפוקח ע"י הרשיונות המתאימים להם. החבילה
{$a->installername}
-השלמה היא
+השלמה היא
קוד פתוח
והיא מבוזרת תחת רישיון
diff --git a/install/lang/hr/install.php b/install/lang/hr/install.php
index 52b9c410ee3..91d10caaca5 100644
--- a/install/lang/hr/install.php
+++ b/install/lang/hr/install.php
@@ -50,15 +50,15 @@ Puna provjera okruženja se obavlja prije svake instalacije ili nadogradnje post
$string['errorsinenvironment'] = 'Pogreške u okruženju poslužitelja!';
$string['installation'] = 'Instalacija';
$string['langdownloaderror'] = 'Nažalost, jezik "{$a}" nije instaliran. Proces instalacije će biti nastavljen na engleskom jeziku.';
-$string['memorylimithelp'] = '
PHP ograničenje memorije na poslužitelju je trenutno podešeno na {$a}.
+$string['memorylimithelp'] = '
PHP ograničenje memorije na poslužitelju je trenutno podešeno na {$a}.
-
Ova postavka može kasnije rezultirati memorijskim problemima na vašem Moodle sustavu, posebno ako imate veći broj uključenih modula i/ili veći broj korisnika.
+
Ova postavka može kasnije rezultirati memorijskim problemima na vašem Moodle sustavu, posebno ako imate veći broj uključenih modula i/ili veći broj korisnika.
Preporučujemo da konfigurirate PHP s većim ograničenjem ako je moguće, recimo 40M. Postoji nekoliko načina na koje to možete napraviti:
-
-
Ako možete, rekompajlirajte PHP s --enable-memory-limit. Ovo će dozvoliti Moodle sustavu samostalno postavljanje memorijskog ograničenja.
-
Ako imate pristup php.ini datoteci, možete promijeniti memory_limit vrijednost na 40M. Ako nemate pristup toj datoteci možete pitati svog administratora da to uradi.
-
Na nekim PHP poslužiteljima možete napraviti .htaccess datoteku u Moodle mapi koja sadrži red:
php_value memory_limit 40M
+
+
Ako možete, rekompajlirajte PHP s --enable-memory-limit. Ovo će dozvoliti Moodle sustavu samostalno postavljanje memorijskog ograničenja.
+
Ako imate pristup php.ini datoteci, možete promijeniti memory_limit vrijednost na 40M. Ako nemate pristup toj datoteci možete pitati svog administratora da to uradi.
+
Na nekim PHP poslužiteljima možete napraviti .htaccess datoteku u Moodle mapi koja sadrži red:
php_value memory_limit 40M
Uzmite u obzir da će na nekim poslužiteljima to spriječiti prikazivanje svih PHP stranica (bit će vam prikazana poruka o grešci), pa ćete na takvim poslužiteljima morati ukloniti .htaccess datoteku.
';
$string['paths'] = 'Putanje (PATH)';
$string['pathserrcreatedataroot'] = 'Instalacijska skripta ne može stvoriti \'Mapu s podacima\' ({$a->dataroot}).';
@@ -69,8 +69,8 @@ $string['pathssubadmindir'] = 'Manji broj webhosting tvrtki koristi /admin kao p
Ovo će promijeniti administratorsku poveznicu na Moodle sustavu u novu vrijednost.';
$string['pathssubdataroot'] = 'Mora postojati mapa u koju Moodle može pohraniti upload datoteke. Korisnik pod kojim je pokrenut web server (obično \'nobody\' ili \'apache\') bi morao imati mogućnost čitanja/pisanja podataka u toj mapi, ali oni ne bi trebali biti dostupni direktno preko weba. Instalacijska skripta će pokušati stvoriti navedenu mapu ako ista ne postoji.';
$string['pathssubdirroot'] = 'Puna putanja (PATH) do Moodle instalacije.';
-$string['pathssubwwwroot'] = 'Unesite punu web adresu putem koje će se pristupati vašem Moodle sustavu.
-Moodle sustavu NIJE MOGUĆE pristupiti preko više URL-ova, odaberite onaj koji vam najviše odgovara.
+$string['pathssubwwwroot'] = 'Unesite punu web adresu putem koje će se pristupati vašem Moodle sustavu.
+Moodle sustavu NIJE MOGUĆE pristupiti preko više URL-ova, odaberite onaj koji vam najviše odgovara.
Ako vaš poslužitelj ima višestruke javne adrese, onda morate postaviti tzv. permanent redirect na sve osim ove adrese.
Ako je vaš poslužitelj dostupan i putem intraneta i Interneta, onda ovdje unesite javnu adresu i podesite DNS tako da vaši intranet korisnici mogu koristiti tu javnu adresu.
Ako adresa nije točna, molimo unesite točnu adresu u vaš internet preglednik i ponovno pokrenite instalaciju s promijenjenim vrijednostima.';
diff --git a/install/lang/hu/install.php b/install/lang/hu/install.php
index 771029f75d3..2bedea2a6ac 100644
--- a/install/lang/hu/install.php
+++ b/install/lang/hu/install.php
@@ -59,18 +59,18 @@ $string['pathsroparentdataroot'] = 'A felettes könyvtás ({$a->parent}) nem ír
$string['pathssubadmindir'] = 'Egy pár webes gazdagép esetén az /admin speciális URL pl. a vezérlőpanel eléréséhez. Ez ütközik a Moodle admin oldalainak standard helyével. Javítás: a telepítésben nevezze át a rendszergazda könyvtárát, az új nevet pedig írja be ide. Például: moodleadmin. Ezzel helyrehozhatók a Moodle rendszergazdai ugrópontjai.';
$string['pathssubdataroot'] = 'Szüksége van egy helyre, ahol a Moodle mentheti a feltöltött állományokat. Ez a könyvtár a webszerver felhasználója (általában \'nobody\' vagy \'apache\') számára legyen mind olvasható, MIND ÍRHATÓ. Ha nem létezik, a telepítő megpróbálja létrehozni.';
$string['pathssubdirroot'] = 'Teljes útvonal a Moodle telepítéséhez. ';
-$string['pathssubwwwroot'] = 'A Moodle elérésére használandó teljes webcím. A Moodle egyszerre több
-címről nem érhető el. Ha portálja több címet használ, a jelen cím kivételével az összeshez állandó
-átirányítást kell beállítania. Ha portálja mind intranetről, mind az internetről elérhető, a nyilvános
-címet itt adja meg, a DNS-t pedig úgy állítsa be, hogy az intranetről a
+$string['pathssubwwwroot'] = 'A Moodle elérésére használandó teljes webcím. A Moodle egyszerre több
+címről nem érhető el. Ha portálja több címet használ, a jelen cím kivételével az összeshez állandó
+átirányítást kell beállítania. Ha portálja mind intranetről, mind az internetről elérhető, a nyilvános
+címet itt adja meg, a DNS-t pedig úgy állítsa be, hogy az intranetről a
nyilvános cím is elérhető legyen. Ha a cím hibás, módosítsa böngészőjében az URL-t, hogy a telepítés egy másik értékkel induljon újra.';
$string['pathsunsecuredataroot'] = 'Az adatok gyökérkönyvtára nem biztonságos.';
$string['pathswrongadmindir'] = 'Nem létezik az admin könyvtár.';
$string['phpextension'] = '{$a} PHP-bővítmény';
$string['phpversion'] = 'PHP-verzió';
$string['phpversionhelp'] = 'A Moodle használatához legalább a PHP 4.3.0 vagy 5.1.0 verziója szükséges
- (az 5.0.x több ismert gond miatt nem ajánlott). Az Ön által használt
-verzió {$a}. Frissítse a PHP-verziót, vagy térjen át újabb PHP-verziót
+ (az 5.0.x több ismert gond miatt nem ajánlott). Az Ön által használt
+verzió {$a}. Frissítse a PHP-verziót, vagy térjen át újabb PHP-verziót
működtető gazdagépre! (5.0.x esetén visszatérhet a 4.4.x verzióhoz is)';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Azért látja ezt az oldalt, mert sikeresen telepítette és futtatja az {$a->packname} {$a->packversion} csomagot számítógépén. Gratulálunk!';
diff --git a/install/lang/hy/install.php b/install/lang/hy/install.php
index 2ff3b58ce9e..17a6fc8038c 100644
--- a/install/lang/hy/install.php
+++ b/install/lang/hy/install.php
@@ -42,17 +42,17 @@ $string['installation'] = 'Տեղակայում';
$string['langdownloaderror'] = 'Ցավոք "{$a}" լեզուն տեղակայված չէ և տեղակայման գործընթացը կշարունակվի անգլերենով։';
$string['memorylimithelp'] = '
PHP-ի հիշողության սահմանը սպասարկչի համար ներկայումս սահմանված է՝ {$a}։
-
հետագայում կարող եք հիշողության հետ կապված խնդիրներ ունենալ,
+
հետագայում կարող եք հիշողության հետ կապված խնդիրներ ունենալ,
եթե Moodle-ում ունենաք շատ մոդուլներ և/կամ մեծ թվով օգտագործողներ։
Խորհուրդ ենք տալիս PHP-ն կազմաձևել հնարավորին շատ հիշողության համար, օրինակ` 40M: Դրա համար կան մի քանի ձևեր, որոնք կարող եք փորձել.
Եթե դուք կարող եք, վերակազմարկել PHP-ն --enable-memory-limit-ով։ Այն թույլ կտա Moodle-ին ինքնուրույն կարգաբերել հիշողության սահմանը։
-
Եթե Ձեզ մատչելի է php.ini ֆայլը, կարող եք փոխել memory_limit-ը՝
+
Եթե Ձեզ մատչելի է php.ini ֆայլը, կարող եք փոխել memory_limit-ը՝
կարգաբերելով մոտավորապես 40M։
Որոշ PHP սպասարկիչներում Moodle դիրեկտորիայում կարող եք ստեղծել .htaccess ֆայլը, որը պարունակում է այս տողը՝
php_value memory_limit 40M
-
Սակայն որոշ սպասարկիչներում սա կկանխարգելի բոլոր PHP էջերի աշխատելը
+
Սակայն որոշ սպասարկիչներում սա կկանխարգելի բոլոր PHP էջերի աշխատելը
(դուք կտեսնեք սխալներ էջերը դիտելիս), այսպիսով դուք պետք է ջնջեք .htaccess ֆայլը։
';
$string['phpversion'] = 'PHP տարբերակ';
@@ -64,7 +64,7 @@ $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Դուք տեսնում եք այս էջը, քանի որ հաջողությամբ տեղակայել և գործարկել {$a->packname} {$a->packversion} փաթեթը։ Շնորհավորանքներ։';
$string['welcomep30'] = '{$a->installername} թողարկումը պարունակում է կիրառական ծրագրեր, որոնք ստեղծում են միջավայր, որտեղ Moodle կաշխատի, մասնավորապես՝';
$string['welcomep40'] = 'Այս փաթեթը պարունակում է նաև Moodle {$a->moodlerelease} ({$a->moodleversion})։';
-$string['welcomep50'] = 'Փաթեթի բոլոր կիրառական ծրագրերի օգտագործումը ղեկավարվում է դրանց համապատասխան արտոնագրերով: Ամբողջական {$a->installername} փաթեթը
+$string['welcomep50'] = 'Փաթեթի բոլոր կիրառական ծրագրերի օգտագործումը ղեկավարվում է դրանց համապատասխան արտոնագրերով: Ամբողջական {$a->installername} փաթեթը
բաց կոդով է և տրամադրվում է GPL արտոնագրով։';
$string['welcomep60'] = 'Հետևյալ էջերի որոշ հեշտ քայլերին հետևելով՝ կարող եք Moodle տեղակայել Ձեր համակարգչում։ Դուք կարող եք համաձայնվել լռելյայն կարգաբերումների հետ կամ փոխել դրանք՝ ձեր պահանջներին համապատասխան:';
$string['welcomep70'] = 'Սեղմեք ստորև գտնվող \'Հաջորդ\' կոճակը, որպեսզի անցնեք Moodle-ի կարգաբերման հաջորդ քայլին:';
diff --git a/install/lang/ka/install.php b/install/lang/ka/install.php
index 1a3fc916062..6c84297ff1b 100644
--- a/install/lang/ka/install.php
+++ b/install/lang/ka/install.php
@@ -38,21 +38,21 @@ $string['dirroot'] = 'Moodle-ის დირექტორია';
$string['installation'] = 'ინსტალირება';
$string['memorylimithelp'] = '
The PHP memory limit for your server is currently set to {$a}.
-
This may cause Moodle to have memory problems later on, especially
+
This may cause Moodle to have memory problems later on, especially
if you have a lot of modules enabled and/or a lot of users.
-
We recommend that you configure PHP with a higher limit if possible, like 40M.
+
We recommend that you configure PHP with a higher limit if possible, like 40M.
There are several ways of doing this that you can try:
-
If you are able to, recompile PHP with --enable-memory-limit.
+
If you are able to, recompile PHP with --enable-memory-limit.
This will allow Moodle to set the memory limit itself.
-
If you have access to your php.ini file, you can change the memory_limit
-setting in there to something like 40M. If you don\'t have access you might
+
If you have access to your php.ini file, you can change the memory_limit
+setting in there to something like 40M. If you don\'t have access you might
be able to ask your administrator to do this for you.
-
On some PHP servers you can create a .htaccess file in the Moodle directory
+
On some PHP servers you can create a .htaccess file in the Moodle directory
containing this line:
php_value memory_limit 40M
-
However, on some servers this will prevent all PHP pages from working
+
However, on some servers this will prevent all PHP pages from working
(you will see errors when you look at pages) so you\'ll have to remove the .htaccess file.
이는 추후에 무들이 원활히 구동되는 데 문제가 될 것입니다. 특히 여러분이 상당히 많은 모듈을 이용하고 또 사용자가 많아지게 되면 문제가 될 소지가 더 커집니다.
-
PHP가 사용할 수 있는 메모리 용랑을 40M 나 아니면 더 큰 값으로 설정하길 권합니다. 설정하는 방법은
+
PHP가 사용할 수 있는 메모리 용랑을 40M 나 아니면 더 큰 값으로 설정하길 권합니다. 설정하는 방법은
여러가지가 있습니다.
만약 PHP소스를 재컴파일 할 수 있다면 옵션에 --enable-memory-limit 을 포함시켜 컴파일 하십시오. 이렇게 해 놓으면 무들 프로그램으로 메모리 용량을 제어할 수 있게 됩니다.
@@ -71,7 +71,7 @@ $string['pathssubdataroot'] = '무들로 업로드된 파일을 저장할 수
$string['pathssubdirroot'] = '무들 설치를 위한 완전한 디렉토리 경로.';
$string['pathssubwwwroot'] = '무들을 접속할 수 있는 전체 웹 주소. 다중 주소를 이용해서는 무들에 접속할 수 없습니다.
만일 사이트가 복수의 공개 주소를 갖고 있는 경우, 여기에 입력한 주소 이외의 곳에서는 영구적인 redirect를 설정해 놓아야만 합니다.
-만약 여러분의 사이트가 인터넷과 인트라넷 모두에서 접속할 수 있다면 여기에 공식적인 주소를 입력하고 DNS를 설정해서 인트라넷 사용자들도 공개 주소를 사용할 수 있게 해야할 것입니다.
+만약 여러분의 사이트가 인터넷과 인트라넷 모두에서 접속할 수 있다면 여기에 공식적인 주소를 입력하고 DNS를 설정해서 인트라넷 사용자들도 공개 주소를 사용할 수 있게 해야할 것입니다.
만일 주소가 올바르지 않다면 브라우저에서 URL을 변경하여 다른 값으로 설치를 다시 시작 하십시요.';
$string['pathsunsecuredataroot'] = 'Dataroot 경로가 안전하지 않음';
$string['pathswrongadmindir'] = '관리자 경로가 존재하지 않음';
diff --git a/install/lang/lv/install.php b/install/lang/lv/install.php
index 83200d68928..6d24b7e829c 100644
--- a/install/lang/lv/install.php
+++ b/install/lang/lv/install.php
@@ -43,16 +43,16 @@ $string['installation'] = 'Instalēšana';
$string['langdownloaderror'] = '“{$a}” valodas pakotne diemžēl netika instalēta. Instalēšana tiks turpināta angļu valodā.';
$string['memorylimithelp'] = '
Pašlaik iestatītais PHP atmiņas apjoma ierobežojums jūsu serverī ir {$a}.
-
Sistēmā Moodle tas vēlāk var izraisīt atmiņas izmantošanas problēmas, it īpaši tad,
+
Sistēmā Moodle tas vēlāk var izraisīt atmiņas izmantošanas problēmas, it īpaši tad,
ja būsit iespējojis lielu skaitu moduļu un/vai lietotāju.
Ja iespējams, ieteicams konfigurēt PHP ar lielāku maksimālās atmiņas apjomu, piemēram, 40 MB. Ir vairāki veidi, kā to var izdarīt, piemēram:
-
Ja iespējams, atkārtoti kompilējiet PHP, izmantojot --enable-memory-limit.
+
Ja iespējams, atkārtoti kompilējiet PHP, izmantojot --enable-memory-limit.
Šādā gadījumā sistēma Moodle atmiņas apjoma ierobežojumu varēs iestatīt automātiski.
Ja jums ir piekļuve php.ini failam, varat mainīt tajā esošo parametra memory_limit iestatījumu, piemēram, uz 40 MB. Ja jums nav piekļuves šim failam, palūdziet to izdarīt administratoram.
Dažos PHP serveros Moodle direktorijā var izveidot failu .htaccess, kurā ir šāda rinda:
php_value memory_limit 40M
-
Tomēr dažos serveros tas neļaus darboties nevienai PHP lapai
+
Tomēr dažos serveros tas neļaus darboties nevienai PHP lapai
(atverot šīs lapas, tiks parādīti kļūdas ziņojumi), un fails .htaccess būs jānoņem.
Ir jājaunina PHP vai jāpāriet uz resursdatoru, kurā tiek izmantota jaunāka PHP versija.
(Ja PHP versija ir 5.0.x, var arī atkāpties uz versiju 4.4.x)';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
-$string['welcomep20'] = 'Jūs redzat šo lapu, jo esat veiksmīgi instalējis un
+$string['welcomep20'] = 'Jūs redzat šo lapu, jo esat veiksmīgi instalējis un
palaidis savā datorā pakotni {$a->packname} {$a->packversion}. Apsveicam!';
-$string['welcomep30'] = 'Šajā {$a->installername} laidienā ir iekļautas lietojumprogrammas,
+$string['welcomep30'] = 'Šajā {$a->installername} laidienā ir iekļautas lietojumprogrammas,
kas paredzētas, lai izveidotu vidi, kurā darbosies sistēma Moodle, proti:';
$string['welcomep40'] = 'Pakotnē ir iekļauta arī sistēma Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'Visu šīs pakotnes lietojumprogrammu izmantošanu regulē attiecīgo
- licenču nosacījumi. Visā {$a->installername} pakotnē ir iekļauts
- atklātais pirmkods, un tā tiek izplatīta
+$string['welcomep50'] = 'Visu šīs pakotnes lietojumprogrammu izmantošanu regulē attiecīgo
+ licenču nosacījumi. Visā {$a->installername} pakotnē ir iekļauts
+ atklātais pirmkods, un tā tiek izplatīta
saskaņā ar GPL licences nosacījumiem.';
-$string['welcomep60'] = 'Nākamajās lapās tiks sniegti vienkārši norādījumi par to, kā
- datorā konfigurēt un iestatīt sistēmu Moodle. Varat akceptēt noklusējuma
+$string['welcomep60'] = 'Nākamajās lapās tiks sniegti vienkārši norādījumi par to, kā
+ datorā konfigurēt un iestatīt sistēmu Moodle. Varat akceptēt noklusējuma
iestatījumus vai varat tos mainīt, lai pielāgotu savām vajadzībām.';
$string['welcomep70'] = 'Noklikšķiniet uz pogas Tālāk, lai turpinātu sistēmas Moodle instalēšanu.';
$string['wwwroot'] = 'Tīmekļa adrese';
diff --git a/install/lang/mk/install.php b/install/lang/mk/install.php
index a8167d75d1e..935b4b5d230 100644
--- a/install/lang/mk/install.php
+++ b/install/lang/mk/install.php
@@ -42,16 +42,16 @@ $string['installation'] = 'Инсталација';
$string['langdownloaderror'] = 'За жал, јазикот "{$a}" не беше инсталиран. Инсталацискиот процес ќе продолжи на англиски.';
$string['memorylimithelp'] = '
Прагот на меморијата кај PHP за Вашиот компјутер моментално е подесена на {$a}.
-
Ова може да предизвика проблеми со меморијата подоцна,
+
Ова може да предизвика проблеми со меморијата подоцна,
посебно ако имате голем број на овозможени модули (единици) и/или голем број на корисници.
Ви препорачуваме да го конфигурирате PHP со најголем можен праг на меморија, како што е 16М.
Еве неколку начини за да го постигнете тоа :
-
Ако сте способен, повторно компајлирајте PHP со--enable-memory-limit.
+
Ако сте способен, повторно компајлирајте PHP со--enable-memory-limit.
Ова ќе овозможи на Moodle сам да го постави прагот на меморијата.
-
Ако имате пристап до Вашата датотека php.ini, можете да го промените memory_limit
- на 16М. Во спротивно, ако немате пристап, можеби ќе бидете способни
+
Ако имате пристап до Вашата датотека php.ini, можете да го промените memory_limit
+ на 16М. Во спротивно, ако немате пристап, можеби ќе бидете способни
да го замолите администраторот да ја заврши оваа работа.
На некои PHP сервери, можете да креирате датотека .htaccess во директориумот на Moodle,
која ги содржи следниве линии :
diff --git a/install/lang/mn/install.php b/install/lang/mn/install.php
index 482b10f68b2..7e8947d5b1e 100644
--- a/install/lang/mn/install.php
+++ b/install/lang/mn/install.php
@@ -60,7 +60,7 @@ $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Та {$a->packname} {$a->packversion} багцыг компьютер дээрээ амжилттай суулгаж ажиллуулсан тул энэ хуудсыг харж байна. Баяр хүргэе!';
$string['welcomep30'] = '{$a->installername} -ний энэ хувилбар нь Mooдл ажиллах орчныг үүсгэх програмууд агуулсан, тэдгээр нь:';
$string['welcomep40'] = 'Энэ багц нь мөн Mooдл {$a->moodlerelease} ({$a->moodleversion})-г агуулсан.';
-$string['welcomep50'] = 'Энэ багц доторх бүх програмууд нь өөрсдийн лизенцтэй. Бүрэн {$a->installername} багц нь
+$string['welcomep50'] = 'Энэ багц доторх бүх програмууд нь өөрсдийн лизенцтэй. Бүрэн {$a->installername} багц нь
open source бөгөөд GPL -ийн лизенцийн дор түгээгддэг.';
$string['welcomep60'] = 'Дараагийн хуудсууд нь компьютер дээрээ Mooдл тохируулах тааруулах энгийн алхмуудыг агуулсан байгаа. Та анхны утгын тохиргоонуудыг хүлээн авч болно, эсвэл өөрийн хэрэгцээнд нийцүүлэн өөрчилж болно.';
$string['welcomep70'] = 'Mooдлээ тохируулахын тулд доорх “Үргэлжлүүлэх” товчин дээр дарж цааж явна уу.';
diff --git a/install/lang/nl/admin.php b/install/lang/nl/admin.php
index 73dc271a02a..8bf5c86f3b3 100644
--- a/install/lang/nl/admin.php
+++ b/install/lang/nl/admin.php
@@ -36,7 +36,7 @@ $string['cliincorrectvalueerror'] = 'Fout, waarde "{$a->value}" voor de optie "{
$string['cliincorrectvalueretry'] = 'Foute waarde. Probeer opnieuw';
$string['clitypevalue'] = 'type waarde';
$string['clitypevaluedefault'] = 'type waarde, druk op Enter om de standaardwaarde te gebruiken ({$a})';
-$string['cliunknowoption'] = 'Onherkenbare opties:
+$string['cliunknowoption'] = 'Onherkenbare opties:
{$a}
gebruik --help optie.';
$string['cliyesnoprompt'] = 'typ j (ja) of n (nee)';
diff --git a/install/lang/no/install.php b/install/lang/no/install.php
index 8abb31663f5..650c985b2d4 100644
--- a/install/lang/no/install.php
+++ b/install/lang/no/install.php
@@ -51,7 +51,7 @@ $string['memorylimithelp'] = '
PHP minnegrensen for serveren din er nå satt t
Dette kan skape minneproblemer for Moodle senere, spesielt hvis du har mange moduler tillatt og/eller mange brukere.
Vi anbefaler at du konfigurer PHP med en høyere grense enn mulig, for eksepmel 40M. Det er flere måter å gjøre dette på.:
-
Hvis du har muligheten, rekompiler PHP med--enable-memory-limit.
+
Hvis du har muligheten, rekompiler PHP med--enable-memory-limit.
Dette vil tillate Moodle å sette minnegrensen selv.
Hvis du har tilgang til php.ini fila di, kan du endre memory_limit innstillinga der til omtrent 40M. Hvis du ikke har tilgang kan du be administrator gjøre dette for deg.
På noen PHP-servere kan du lage en .htaccess fil i Moodlemappen som inneholder denne linjen:
diff --git a/install/lang/pl/install.php b/install/lang/pl/install.php
index 630bf341d24..92f3b0a2b97 100644
--- a/install/lang/pl/install.php
+++ b/install/lang/pl/install.php
@@ -68,7 +68,7 @@ $string['pathsunsecuredataroot'] = 'Lokalizacja głównego katalogu danych nie j
$string['pathswrongadmindir'] = 'Katalog admin nie istnieje';
$string['phpextension'] = '{$a} rozszerzenie PHP';
$string['phpversion'] = 'Wersja PHP';
-$string['phpversionhelp'] = '
Moodle wymaga wersji PHP co najmniej 4.3.0 lub 5.1.0 (5.0.x posiada kilka znanych problemów).
+$string['phpversionhelp'] = '
Moodle wymaga wersji PHP co najmniej 4.3.0 lub 5.1.0 (5.0.x posiada kilka znanych problemów).
Obecnie jest uruchomiona wersja {$a}
Musisz uaktualnić wersję PHP lub przenieść na host z nowszą wersją PHP! (W przypadku wersji 5.0.x możesz dokonać downgrade do wersji 4.4.x)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
diff --git a/install/lang/pt/admin.php b/install/lang/pt/admin.php
index 783189c0c10..c05e227eefe 100644
--- a/install/lang/pt/admin.php
+++ b/install/lang/pt/admin.php
@@ -36,8 +36,8 @@ $string['cliincorrectvalueerror'] = 'Erro. Valor "{$a->value}" incorreto para "{
$string['cliincorrectvalueretry'] = 'Valor incorreto, por favor tente novamente';
$string['clitypevalue'] = 'valor do tipo';
$string['clitypevaluedefault'] = 'Escreva o valor. Ou Enter para usar o valor por omissão ({$a}).';
-$string['cliunknowoption'] = 'Opções desconhecidas:
-{$a}
+$string['cliunknowoption'] = 'Opções desconhecidas:
+{$a}
Por favor use a opção --help';
$string['cliyesnoprompt'] = 'digite s (para sim) ou n (para não)';
$string['environmentrequireinstall'] = 'é necessário estar instalada/ativa';
diff --git a/install/lang/pt/install.php b/install/lang/pt/install.php
index 2c32390404f..28b379e21ec 100644
--- a/install/lang/pt/install.php
+++ b/install/lang/pt/install.php
@@ -69,7 +69,7 @@ $string['pathshead'] = 'Confirmar caminhos';
$string['pathsrodataroot'] = 'A diretoria dataroot não tem permissões de escrita.';
$string['pathsroparentdataroot'] = 'O diretório pai ({$a->parent}) não tem permissões de escrita. O programa de instalação não conseguiu criar o diretório de dados ({$a->dataroot})';
$string['pathssubadmindir'] = 'Alguns (poucos) alojamentos web usam /admin como um URL especial para permitir o acesso ao control panel ou a outras funcionalidades.
-Infelizmente esta designação entra em conflito com a localização que o Moodle atribui às páginas de administração.
+Infelizmente esta designação entra em conflito com a localização que o Moodle atribui às páginas de administração.
A solução passa por renomear o diretório admin da sua instalação do Moodle e colocando o nome escolhido aqui. Por exemplo:
moodleadmin. Isto corrige os links de administração no Moodle.';
$string['pathssubdataroot'] = 'É necessário um local onde o Moodle possa gravar os ficheiros submetidos. Este diretório tem que ter permissões de leitura e ESCRITA pelo servidor web (normalmente \'nobody\' ou \'apache\'), mas não pode estar acessível através da web. O programa de instalação tentará criar este diretório se ele ainda não existir.';
diff --git a/install/lang/pt_br/install.php b/install/lang/pt_br/install.php
index 15b6f3de0a0..fa8b9b95b99 100644
--- a/install/lang/pt_br/install.php
+++ b/install/lang/pt_br/install.php
@@ -34,6 +34,7 @@ $string['admindirname'] = 'Diretório admin';
$string['availablelangs'] = 'Lista de idiomas disponíveis';
$string['chooselanguagehead'] = 'Escolha um idioma';
$string['chooselanguagesub'] = 'Por favor, escolha o idioma para a instalação.Este idioma também será utilizado como idioma padrão do site, embora você possa mudar mais tarde.';
+$string['clialreadyconfigured'] = 'Arquivo config.php já existente. Por favor use admin/cli/install_database.php se você quer instalar este site';
$string['clialreadyinstalled'] = 'O arquivo config.php já existe, por favor use admin/cli/upgrade.php, se você quiser atualizar o seu site.';
$string['cliinstallheader'] = 'Programa de instalação por linha de comando do Moodle {$a}';
$string['databasehost'] = 'Host da base de dados';
@@ -82,7 +83,7 @@ $string['phpversionhelp'] = '
Moodle requer a versão 4.3.0 de PHP ou posterio
Atualize a versão do PHP!
(atenção, a versão 5.0.x tem muitos problemas - use a versão 5.1.0 ou a 4.4)';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
-$string['welcomep20'] = 'Se você chegou nesta página, o pacote {$a->packname} {$a->packversion} foi instalado. Parabéns!';
+$string['welcomep20'] = 'Você está vendo esa página pois instalou com sucesso o pacote{$a->packname} {$a->packversion}. Parabéns!';
$string['welcomep30'] = 'Esta versão do {$a->installername} inclui as aplicações para a criação de um ambiente em que Moodle possa operar:';
$string['welcomep40'] = 'O pacote inclui também o Moodle {$a->moodlerelease} ({$a->moodleversion}).';
$string['welcomep50'] = 'O uso das aplicações incluídas neste pacote é regulamentado pelas respectivas licenças. O instalador completo {$a->installername} é open source e é distribuído com uma licença GPL.';
diff --git a/install/lang/ru/install.php b/install/lang/ru/install.php
index c715ae48451..a1cab1b9f2e 100644
--- a/install/lang/ru/install.php
+++ b/install/lang/ru/install.php
@@ -53,12 +53,12 @@ $string['memorylimithelp'] = '
Сейчас ограничение памят
Из-за этого у через какое-то время у Moodle могут возникнуть проблемы с памятью, особенно если у Вас будет много модулей и/или пользователей.
-
Мы рекомендуем, если возможно, установить в PHP более высокое ограничение памяти, например 40M.
+
Мы рекомендуем, если возможно, установить в PHP более высокое ограничение памяти, например 40M.
Это можно попробовать сделать следующими способами:
-
Если есть возможность, перекомпилируёте PHP с ключом --enable-memory-limit.
+
Если есть возможность, перекомпилируёте PHP с ключом --enable-memory-limit.
В этом случае Moodle сможет самостоятельна установить ограничение памяти.
-
Если у Вас есть доступ к файлу php.ini, Вы можете изменить параметр memory_limit
+
Если у Вас есть доступ к файлу php.ini, Вы можете изменить параметр memory_limit
на что-нибудь типа 40M. Если доступа у Вас нет, может быть у Вас есть возможность попросить администратора сделать это.
На некоторых серверах PHP можно создать в каталоге Moodle файл .htaccess содержащий следующую строку:
To lahko povzroči, da bo imel Moodle pozneje težave s pomnilnikom. Še posebej,
če imate vključenih veliko modulov oziroma veliko uporabnikov.
-
Priporočamo, da konfigurirate PHP z višjo omejitvijo, če je možno npr. 40M.
+
Priporočamo, da konfigurirate PHP z višjo omejitvijo, če je možno npr. 40M.
To lahko poskusite storiti na več načinov:
-
Če lahko, ponovno prevedite PHP z --enable-memory-limit.
+
Če lahko, ponovno prevedite PHP z --enable-memory-limit.
To bo omogočilo, da bo Moodle sam nastavil omejitev pomnilnik zase.
-
Če imate dostop do vaše datoteke php.ini, lahko spremenite vrednost memory_limit
- v tej datoteki na, recimo, 40M. Če nimate dostopa, boste morda
+
Če imate dostop do vaše datoteke php.ini, lahko spremenite vrednost memory_limit
+ v tej datoteki na, recimo, 40M. Če nimate dostopa, boste morda
lahko prosili vašega skrbnika, da to naredi za vas.
-
Na nekaterih strežnikih PHP lahko ustvarite datoteko .htaccess v imeniku Moodle,
+
Na nekaterih strežnikih PHP lahko ustvarite datoteko .htaccess v imeniku Moodle,
ki naj vsebuje to vrstico:
php_value memory_limit 40M
-
Vendar lahko to prepreči delovanje vseh PHP strani
+
Vendar lahko to prepreči delovanje vseh PHP strani
(ob prikazu strani boste videli napake) in boste morali odstraniti datoteko .htaccess.
Posodobiti in nadgraditi morate PHP ali premakniti program na strežnik s novejšo različico PHP!
(V primeru različice 5.0.x lahko namestite tudi različico 4.4.x)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
-$string['welcomep20'] = 'To stran vidite, ker ste uspešno namestili in
+$string['welcomep20'] = 'To stran vidite, ker ste uspešno namestili in
zagnali paket {$a->packname} {$a->packversion} na vašem računalniku. Čestitamo!';
-$string['welcomep30'] = 'Ta različica {$a->installername} vključuje aplikacije
+$string['welcomep30'] = 'Ta različica {$a->installername} vključuje aplikacije
za ustvarjanje okolja v katerem bo deloval Moodle in sicer:';
$string['welcomep40'] = 'Ta paket vključuje tudi Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'Uporabo vseh aplikacij v tem paketu določajo njihove ustrezne
- licence. Celoten paket {$a->installername} je
- odprta koda in se razširja
+$string['welcomep50'] = 'Uporabo vseh aplikacij v tem paketu določajo njihove ustrezne
+ licence. Celoten paket {$a->installername} je
+ odprta koda in se razširja
pod licenco GPL.';
-$string['welcomep60'] = 'Naslednje strani vas bodo popeljale skozi nekaj enostavno sledljivih korakov za
- konfiguracijo in nastavitev Moodle na vašem računalniku. Sprejmete lahko privzete
+$string['welcomep60'] = 'Naslednje strani vas bodo popeljale skozi nekaj enostavno sledljivih korakov za
+ konfiguracijo in nastavitev Moodle na vašem računalniku. Sprejmete lahko privzete
nastavitve ali jih, če tako želite, spremenite, da bodo ustrezale vašim potrebam.';
$string['welcomep70'] = 'Kliknite spodnji gumb "Naprej" za nadaljevanje nastavitve Moodle.';
$string['wwwroot'] = 'Spletni naslov';
diff --git a/install/lang/sm/install.php b/install/lang/sm/install.php
index 0a3b2bcaf73..8eb9d888140 100644
--- a/install/lang/sm/install.php
+++ b/install/lang/sm/install.php
@@ -37,21 +37,21 @@ $string['dirroot'] = 'Auala atu i le Moodle';
$string['installation'] = 'Fa\'atu/Install';
$string['memorylimithelp'] = '
The PHP memory limit for your server is currently set to {$a}.
-
This may cause Moodle to have memory problems later on, especially
+
This may cause Moodle to have memory problems later on, especially
if you have a lot of modules enabled and/or a lot of users.
-
We recommend that you configure PHP with a higher limit if possible, like 40M.
+
We recommend that you configure PHP with a higher limit if possible, like 40M.
There are several ways of doing this that you can try:
-
If you are able to, recompile PHP with --enable-memory-limit.
+
If you are able to, recompile PHP with --enable-memory-limit.
This will allow Moodle to set the memory limit itself.
-
If you have access to your php.ini file, you can change the memory_limit
- setting in there to something like 40M. If you don\'t have access you might
+
If you have access to your php.ini file, you can change the memory_limit
+ setting in there to something like 40M. If you don\'t have access you might
be able to ask your administrator to do this for you.
-
On some PHP servers you can create a .htaccess file in the Moodle directory
+
On some PHP servers you can create a .htaccess file in the Moodle directory
containing this line:
php_value memory_limit 40M
-
However, on some servers this will prevent all PHP pages from working
+
However, on some servers this will prevent all PHP pages from working
(you will see errors when you look at pages) so you\'ll have to remove the .htaccess file.
';
$string['phpversion'] = 'Liliuga PHP';
diff --git a/install/lang/sr_cr/install.php b/install/lang/sr_cr/install.php
index 676ee680716..b4b78e7234b 100644
--- a/install/lang/sr_cr/install.php
+++ b/install/lang/sr_cr/install.php
@@ -69,8 +69,8 @@ $string['pathsroparentdataroot'] = 'Није могућ упис у надређ
$string['pathssubadmindir'] = 'Врло мали број веб сервера користи /admin као специјални URL за приступ разним подешавањима (контролни панел и сл.). Нажалост, то доводи до конфликта са стандардном локацијом за администраторске странице у Moodleu. Овај проблем можете решити тако што ћете променити име администраторског директоријума у вашој инсталацији, и овде уписати то ново име. На пример moodleadmin. Ово подешавање ће преправити администраторске линкове у Moodle систему.';
$string['pathssubdataroot'] = 'Потребан вам је простор где ће Moodle чувати постављене датотеке. Овај директоријум треба да буде подешен тако да се може читати и у њега уписивати од стране корисника веб сервера (обично \'nobody\' или \'apache\'), али истовремено мора бити доступан директно преко веба. Уколико овај директоријум не постоји Moodle ће покушати да га креира током инсталације.';
$string['pathssubdirroot'] = 'Пуна путања до директотијума за инсталацију Moodlea.';
-$string['pathssubwwwroot'] = 'Пуна веб адреса путем које ће се приступати Moodleu. Није могуће приступати Moodleu користећи више адреса.
-Ако ваш сајт има више јавних адреса онда на свима морате да подесите перманентне редирекције осим на овој.
+$string['pathssubwwwroot'] = 'Пуна веб адреса путем које ће се приступати Moodleu. Није могуће приступати Moodleu користећи више адреса.
+Ако ваш сајт има више јавних адреса онда на свима морате да подесите перманентне редирекције осим на овој.
Ако је ваш сајт доступан са интернета али и из интранет окружења овде употребите јавну адресу и подесите DNS тако да и интранет корисници могу да користе јавну адресу.
Ако је адреса нетачна промените URL у свом веб читачу да бисте поново покренули инсталацију са другачијом вредношћу.';
$string['pathsunsecuredataroot'] = 'Dataroot локација није безбедна';
diff --git a/install/lang/sr_lt/install.php b/install/lang/sr_lt/install.php
index bdc611b35f2..0cfa2e3a55d 100644
--- a/install/lang/sr_lt/install.php
+++ b/install/lang/sr_lt/install.php
@@ -69,8 +69,8 @@ $string['pathsroparentdataroot'] = 'Nije moguć upis u nadređeni direktorijum (
$string['pathssubadmindir'] = 'Vrlo mali broj veb servera koristi /admin kao specijalni URL za pristup raznim podešavanjima (kontrolni panel i sl.). Nažalost, to dovodi do konflikta sa standardnom lokacijom za administratorske stranice u Moodleu. Ovaj problem možete rešiti tako što ćete promeniti ime administratorskog direktorijuma u vašoj instalaciji, i ovde upisati to novo ime. Na primer moodleadmin. Ovo podešavanje će prepraviti administratorske linkove u Moodle sistemu.';
$string['pathssubdataroot'] = 'Potreban vam je prostor gde će Moodle čuvati postavljene datoteke. Ovaj direktorijum treba da bude podešen tako da se može čitati i u njega upisivati od strane korisnika veb servera (obično \'nobody\' ili \'apache\'), ali istovremeno mora biti dostupan direktno preko veba. Ukoliko ovaj direktorijum ne postoji Moodle će pokušati da ga kreira tokom instalacije.';
$string['pathssubdirroot'] = 'Puna putanja do direktotijuma za instalaciju Moodlea.';
-$string['pathssubwwwroot'] = 'Puna veb adresa putem koje će se pristupati Moodleu. Nije moguće pristupati Moodleu koristeći više adresa.
-Ako vaš sajt ima više javnih adresa onda na svima morate da podesite permanentne redirekcije osim na ovoj.
+$string['pathssubwwwroot'] = 'Puna veb adresa putem koje će se pristupati Moodleu. Nije moguće pristupati Moodleu koristeći više adresa.
+Ako vaš sajt ima više javnih adresa onda na svima morate da podesite permanentne redirekcije osim na ovoj.
Ako je vaš sajt dostupan sa interneta ali i iz intranet okruženja ovde upotrebite javnu adresu i podesite DNS tako da i intranet korisnici mogu da koriste javnu adresu.
Ako je adresa netačna promenite URL u svom veb čitaču da biste ponovo pokrenuli instalaciju sa drugačijom vrednošću.';
$string['pathsunsecuredataroot'] = 'Dataroot lokacija nije bezbedna';
diff --git a/install/lang/ta/install.php b/install/lang/ta/install.php
index 4d4eee7f10a..05782f1d0b5 100644
--- a/install/lang/ta/install.php
+++ b/install/lang/ta/install.php
@@ -42,21 +42,21 @@ $string['installation'] = 'Installation';
$string['langdownloaderror'] = 'Unfortunately the language "{$a}" was not installed. The installation process will continue in English.';
$string['memorylimithelp'] = '
The PHP memory limit for your server is currently set to {$a}.
-
This may cause Moodle to have memory problems later on, especially
+
This may cause Moodle to have memory problems later on, especially
if you have a lot of modules enabled and/or a lot of users.
-
We recommend that you configure PHP with a higher limit if possible, like 40M.
+
We recommend that you configure PHP with a higher limit if possible, like 40M.
There are several ways of doing this that you can try:
-
If you are able to, recompile PHP with --enable-memory-limit.
+
If you are able to, recompile PHP with --enable-memory-limit.
This will allow Moodle to set the memory limit itself.
-
If you have access to your php.ini file, you can change the memory_limit
- setting in there to something like 40M. If you don\'t have access you might
+
If you have access to your php.ini file, you can change the memory_limit
+ setting in there to something like 40M. If you don\'t have access you might
be able to ask your administrator to do this for you.
-
On some PHP servers you can create a .htaccess file in the Moodle directory
+
On some PHP servers you can create a .htaccess file in the Moodle directory
containing this line:
php_value memory_limit 40M
-
However, on some servers this will prevent all PHP pages from working
+
However, on some servers this will prevent all PHP pages from working
(you will see errors when you look at pages) so you\'ll have to remove the .htaccess file.
You must upgrade PHP or move to a host with a newer version of PHP!
(In case of 5.0.x you could also downgrade to 4.4.x version)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
-$string['welcomep20'] = 'You are seeing this page because you have successfully installed and
+$string['welcomep20'] = 'You are seeing this page because you have successfully installed and
launched the {$a->packname} {$a->packversion} package in your computer. Congratulations!';
-$string['welcomep30'] = 'This release of the {$a->installername} includes the applications
+$string['welcomep30'] = 'This release of the {$a->installername} includes the applications
to create an environment in which Moodle will operate, namely:';
$string['welcomep40'] = 'The package also includes Moodle {$a->moodlerelease} ({$a->moodleversion}).';
-$string['welcomep50'] = 'The use of all the applications in this package is governed by their respective
- licences. The complete {$a->installername} package is
- open source and is distributed
+$string['welcomep50'] = 'The use of all the applications in this package is governed by their respective
+ licences. The complete {$a->installername} package is
+ open source and is distributed
under the GPL license.';
-$string['welcomep60'] = 'The following pages will lead you through some easy to follow steps to
- configure and set up Moodle on your computer. You may accept the default
+$string['welcomep60'] = 'The following pages will lead you through some easy to follow steps to
+ configure and set up Moodle on your computer. You may accept the default
settings or, optionally, amend them to suit your own needs.';
$string['welcomep70'] = 'Click the "Next" button below to continue with the set up of Moodle.';
$string['wwwroot'] = 'இணைய முகவரி';
diff --git a/install/lang/ta_lk/install.php b/install/lang/ta_lk/install.php
index 06f4810c169..13ebd278847 100644
--- a/install/lang/ta_lk/install.php
+++ b/install/lang/ta_lk/install.php
@@ -55,7 +55,7 @@ $string['memorylimithelp'] = '
உங்களுடைய சேவையக
சில PHP சேவையகங்களில் நீங்கள் இந்த வரியைக் கொண்டிருக்கின்ற Moodle கோப்புத் தொகுதியிலுள்ள ஒரு .htaccess கோப்பை உருவாக்க முடிகிறது.
php_பெறுமதி நினைவக_வரையறை 40M
-
+
எப்படியாயினும், சில சேவையகங்களில் இது வேலை செய்வதிலிருந்து அனைத்து PHP பக்கங்களை தடுக்கும்(நீங்கள் பக்கங்களை பார்க்கின்ற போது தவறுகளை பார்ப்பீர்கள்) ஆகையால் நீங்கள் .htaccess கோப்பை நீக்க வேண்டியிருக்கும்.
Moodle குறைந்தளவு ஒரு
(5.0.x இன் சம்பவத்தில்,நீங்கள் 4.4.x பதிப்பிற்கு கீழ்த்தரப்படுத்த முடிகின்றது)
';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
-$string['welcomep20'] = 'நீங்கள் வெற்றிகரமாக நிறுவி ஆரம்பித்துள்ளதன் காரணமாக நீங்கள் இப்பக்கத்தை பார்க்கிறீர்கள்
+$string['welcomep20'] = 'நீங்கள் வெற்றிகரமாக நிறுவி ஆரம்பித்துள்ளதன் காரணமாக நீங்கள் இப்பக்கத்தை பார்க்கிறீர்கள்
{$a->packname} {$a->packversion} உங்கள் கணனியில் உள்ள பொதியில் உள்ளது.வாழ்த்துக்கள்!';
$string['welcomep30'] = '{$a->installername}ன் வெளியீடு, Moodle இயங்கும் என்கின்ற ஒரு சூழலை உருவாக்குவதற்கு பயன்பாட்டு மென்பொருளை உள்ளடக்குகிறது.';
$string['welcomep40'] = 'பொதி, Moodle {$a->moodlerelease} ({$a->moodleversion}) ஐயும் உள்ளடக்கியிருக்கின்றது.';
diff --git a/install/lang/th/install.php b/install/lang/th/install.php
index ffbfb560aab..92d663811b6 100644
--- a/install/lang/th/install.php
+++ b/install/lang/th/install.php
@@ -48,7 +48,7 @@ $string['memorylimithelp'] = '
Iminumungkahi namin na isaayos mo ang PHP na may mas mataas na limit kung maaari, tulad ng 40M.
May iba\'t-ibang paraan na magagawa kayo upang ito ay maiisakatuparan:
-
Kunga maaari mong gawin, muling ikompayl ang PHP na may --enable-memory-limit.
+
Kunga maaari mong gawin, muling ikompayl ang PHP na may --enable-memory-limit.
Pahihintulutan nito ang Moodle na itakda ang memory limit sa sarili nito.
-
Kung mapapasok mo ang iyong sakong php.ini, mababago mo ang memory_limit
+
Kung mapapasok mo ang iyong sakong php.ini, mababago mo ang memory_limit
na kaayusan doon at gawin itong mga 40M. Kung wala kang karapatang pasukin ito
baka puwede mong hilingin sa administrador na gawin ito para sa iyo.
Sa ilang PHP serve maaari kang lumikha ng isang sakong .htaccess sa bugsok ng Moodle
na naglalaman ng linyang ito:
php_value memory_limit 40M
-
Subali\'t sa ilang server ay pipigilin nito ang paggana ng lahat ng pahinang PHP
+
Subali\'t sa ilang server ay pipigilin nito ang paggana ng lahat ng pahinang PHP
(makakakita ka ng mga error kapag tumingin ka sa mga pahina) kaya\'t kakailanganin mong tanggalin ang sakong .htaccess.
\'E malava eni ke fakalanga\'i e Muutolo ke \'iai ha ngaahi memolii palopalema \'a mui ange , tautautefito kapau \'oku ma\'u ha ngaahi motiula \'oku malava pea/mo ha kau \'iusa tokolahi.
-
\'Oku mau faka\'ai\'ai koe keke fakafika ho\'o PHP aki ha limiti ma\'olunga kapau \'e lava, hange koe 40M.
+
\'Oku mau faka\'ai\'ai koe keke fakafika ho\'o PHP aki ha limiti ma\'olunga kapau \'e lava, hange koe 40M.
Koe ngaahi founga kehekehe eni teke lava \'o \'ahi\'ahi\'i ki hono fai \'o \'eni:
-
Kapau teke lava,toe fakatahatah\'i e PHP moe --malava-memolii-limiti.
- \'E hanga he\'e me\'a ko\'eni \'o fakangofua e Muutolo kene seti pee e limiti \'oe memolii \'eia pee.
-
Kapau \'oku \'iai ha\'o \'ekisesi ki ho\'o php.ini faile, teke lava \'o liliu memolii_limiti
- \'o seti\'i ia ki ha me\'a hangee koe 40M. Kapau \'oku \'ikai ke \'iai ha\'o \'ekisesi, teke kei malava pe keke kole ki ho\'o \'etiminisituleitaa kene fai \'eni ma\'au.
+
Kapau teke lava,toe fakatahatah\'i e PHP moe --malava-memolii-limiti.
+ \'E hanga he\'e me\'a ko\'eni \'o fakangofua e Muutolo kene seti pee e limiti \'oe memolii \'eia pee.
+
Kapau \'oku \'iai ha\'o \'ekisesi ki ho\'o php.ini faile, teke lava \'o liliu memolii_limiti
+ \'o seti\'i ia ki ha me\'a hangee koe 40M. Kapau \'oku \'ikai ke \'iai ha\'o \'ekisesi, teke kei malava pe keke kole ki ho\'o \'etiminisituleitaa kene fai \'eni ma\'au.
\'i he ni\'ihi \'oe ngaahi seeva PHPtekelava \'o fakatupu ha .ht\'ekisesi faile \'i loto \'ihe fakahinohino Muutolo \'oku \'i loto \'i he laine ko \'eni:
php_mahu\'inga memolii_limiti 40M
-
Kaekehe, he\'ikai ke lava \'eni ia \'i he ni\'ihi \'oe ngaahi seevaall PHP ngaahi peesi \'oku ngaue
+
Kaekehe, he\'ikai ke lava \'eni ia \'i he ni\'ihi \'oe ngaahi seevaall PHP ngaahi peesi \'oku ngaue
(teke lava \'o sio ki he ngaahi fehalaaki \'i ha\'o sio ki he ngaahi peesi) koia ai kuopau keke to\'o e .ht\'ekisesi faile.
PHP thiết lập giới hạn bộ nhớ cho máy chủ của bạn hiện tại là {$a}.
-
Đây có thể là nguyên nhân Moodle có các vấn đề về bộ nhớ vào một thời điểm nào đó, đặc biệt
+
Đây có thể là nguyên nhân Moodle có các vấn đề về bộ nhớ vào một thời điểm nào đó, đặc biệt
nếu bạn có nhiều môđun được cho phép và nhiều người dùng.
-
Chúng tôi đề nghị rằng bạn cấu hình PHP với một giới hạn lớn hơn nếu có thể, chẳng hạn như 40M.
+
Chúng tôi đề nghị rằng bạn cấu hình PHP với một giới hạn lớn hơn nếu có thể, chẳng hạn như 40M.
Có một số cách để làm điều này mà bạn có thể thử:
-
Nếu bạn có khả năng, biên tập lại PHP với --giới hạn bộ nhớ cho phép.
+
Nếu bạn có khả năng, biên tập lại PHP với --giới hạn bộ nhớ cho phép.
Điều này sẽ cho phép Moodle tự thiết lập giới hạn bộ nhớ.
-
Nếu bạn truy cập file php.ini của bạn, bạn có thể thay đổi giới hạn bộ nhớ
- thiết lập trong đó thành một giá trị nào đó chẳng hạn như 40M. Nếu bạn không được phép truy cập
+
Nếu bạn truy cập file php.ini của bạn, bạn có thể thay đổi giới hạn bộ nhớ
+ thiết lập trong đó thành một giá trị nào đó chẳng hạn như 40M. Nếu bạn không được phép truy cập
bạn có thể yêu cầu quản trị viên của bạn để làm điều đó cho bạn.
-
Trên một số máy chủ chạy PHP bạn có thể tạo một file .htaccess trong thư mục Moodle
+
Trên một số máy chủ chạy PHP bạn có thể tạo một file .htaccess trong thư mục Moodle
chứa dòng này:
giá trị giới hạn bộ nhớ 40M
-
Tuy nhiên, trên một số máy chủ điều này có thể ngăn cản tất cả các trang PHP làm việc
+
Tuy nhiên, trên một số máy chủ điều này có thể ngăn cản tất cả các trang PHP làm việc
(bạn sẽ nhìn thấy các lỗi khi bạn xem xét những trang này )vì thế bạn sẽ pahỉ di chuyền file .htaccess.
';
$string['phpversion'] = 'Phiên bản PHP';
diff --git a/lang/en/access.php b/lang/en/access.php
index b338d424d16..ee81afc8a35 100644
--- a/lang/en/access.php
+++ b/lang/en/access.php
@@ -39,8 +39,6 @@ $string['skipa'] = 'Skip {$a}';
$string['skipblock'] = 'Skip block';
$string['skipnavigation'] = 'Skip navigation';
$string['skipto'] = 'Skip to {$a}';
-$string['tabledata'] = 'Data table, {$a}';
-$string['tablelayout'] = 'Layout table, {$a}';
$string['tocontent'] = 'Skip to main content';
$string['tonavigation'] = 'Go to navigation';
$string['youarehere'] = 'You are here';
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 5cee004eef8..6dbb85977b9 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -183,6 +183,7 @@ $string['configdenyemailaddresses'] = 'To deny email addresses from particular d
$string['configenabledevicedetection'] = 'Enables detection of mobiles, smartphones, tablets or default devices (desktop PCs, laptops, etc) for the application of themes and other features.';
$string['configdisableuserimages'] = 'Disable the ability for users to change user profile images.';
$string['configdisplayloginfailures'] = 'This will display information to selected users about previous failed logins.';
+$string['configdndallowtextandlinks'] = 'Enable or disable the dragging and dropping of text and links onto a course page, alongside the dragging and dropping of files. Note that the dragging of text into Firefox or between different browsers is unreliable and may result in no data being uploaded, or corrupted text being uploaded.';
$string['configdocroot'] = 'Defines the path to the Moodle Docs. You can change this if you wish to have your own custom online documentation. However, if you do that make sure that the paths in your documentation follow the same format as http://docs.moodle.org.';
$string['configdoctonewwindow'] = 'If you enable this, then links to Moodle Docs will be shown in a new window.';
$string['configeditordictionary'] = 'This value will be used if aspell doesn\'t have dictionary for users own language.';
@@ -431,6 +432,7 @@ $string['devicetype'] = 'Device type';
$string['disableuserimages'] = 'Disable user profile images';
$string['displayerrorswarning'] = 'Enabling the PHP setting display_errors is not recommended on production sites because some error messages may reveal sensitive information about your server.';
$string['displayloginfailures'] = 'Display login failures to';
+$string['dndallowtextandlinks'] = 'Drag and drop upload of text/links';
$string['docroot'] = 'Moodle Docs document root';
$string['doctonewwindow'] = 'Open in new window';
$string['download'] = 'Download';
@@ -634,6 +636,7 @@ $string['maturity50'] = 'Alpha';
$string['maturity100'] = 'Beta';
$string['maturity150'] = 'Release candidate';
$string['maturity200'] = 'Stable version';
+$string['maturityallowunstable'] = 'Hint: You may want to run this script with --allow-unstable option';
$string['maturitycoreinfo'] = 'Your site is currently running unstable "{$a}" development code.';
$string['maturitycorewarning'] = 'The version of Moodle that you are about to install or upgrade to contains
unstable "{$a}" development code that is not suitable for use on most production
@@ -751,6 +754,8 @@ $string['pleaserefreshregistration'] = 'Your site has been registered with moodl
$string['pleaseregister'] = 'Please register your site to remove this button';
$string['plugin'] = 'Plugin';
$string['plugins'] = 'Plugins';
+$string['pluginscheck'] = 'Plugin dependencies check';
+$string['pluginscheckfailed'] = 'Dependencies check failed for {$a->pluginslist}';
$string['pluginschecktodo'] = 'You must solve all the plugin requirements before proceeding to install this Moodle version!';
$string['pluginsoverview'] = 'Plugins overview';
$string['profilecategory'] = 'Category';
diff --git a/lang/en/backup.php b/lang/en/backup.php
index 3cb7ec138f9..fa809254ddb 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -117,6 +117,9 @@ $string['errorinvalidformat'] = 'Unknown backup format';
$string['errorinvalidformatinfo'] = 'The selected file is not a valid Moodle backup file and can\'t be restored.';
$string['executionsuccess'] = 'The backup file was successfully created.';
$string['filename'] = 'Filename';
+$string['filereferencesincluded'] = 'File references to external contents included in backup package, they won\'t work on other sites.';
+$string['filereferencessamesite'] = 'Backup is from the same site, file references can be restored';
+$string['filereferencesnotsamesite'] = 'Backup is from other site, file references cannot be restored';
$string['generalactivities'] = 'Include activities';
$string['generalanonymize'] = 'Anonymise information';
$string['generalbackdefaults'] = 'General backup defaults';
@@ -148,6 +151,7 @@ $string['includeditems'] = 'Included items:';
$string['includesection'] = 'Section {$a}';
$string['includeuserinfo'] = 'User data';
$string['loglifetime'] = 'Keep logs for';
+$string['includefilereferences'] = 'File references to external contents';
$string['locked'] = 'Locked';
$string['lockedbypermission'] = 'You don\'t have sufficient permissions to change this setting';
$string['lockedbyconfig'] = 'This setting has been locked by the default backup settings';
diff --git a/lang/en/error.php b/lang/en/error.php
index 75fb0be028c..b40859b4e18 100644
--- a/lang/en/error.php
+++ b/lang/en/error.php
@@ -224,6 +224,7 @@ $string['errorsettinguserpref'] = 'Error setting user preference';
$string['errorunzippingfiles'] = 'Error unzipping files';
$string['expiredkey'] = 'Expired key';
$string['externalauthpassworderror'] = 'Non-empty password for external authentication';
+$string['externalfilenolocation'] = 'External file has no location path';
$string['failtoloadblocks'] = 'One or more blocks are registered in the database, but they all failed to load!';
$string['fieldrequired'] = '"{$a}" is a required field';
$string['fileexists'] = 'File exists';
@@ -323,6 +324,7 @@ $string['invalidsection'] = 'Course module record contains invalid section';
$string['invalidsesskey'] = 'Incorrect sesskey submitted, form not accepted!';
$string['invalidshortname'] = 'That\'s an invalid short course name';
$string['invalidstatedetected'] = 'Something has gone wrong: {$a}. This should never normally happen.';
+$string['invalidsourcefield'] = 'Draft file\'s source field is invalid';
$string['invalidurl'] = 'Invalid URL';
$string['invaliduser'] = 'Invalid user';
$string['invaliduserid'] = 'Invalid user id';
diff --git a/lang/en/mimetypes.php b/lang/en/mimetypes.php
index 17d224e7c4d..9cb966dd3cb 100644
--- a/lang/en/mimetypes.php
+++ b/lang/en/mimetypes.php
@@ -18,6 +18,19 @@
/**
* Strings for component 'mimetypes', language 'en', branch 'MOODLE_20_STABLE'
*
+ * Strings are used to display human-readable name of mimetype. Some mimetypes share the same
+ * string. The following attributes are passed in the parameter when processing the string:
+ * $a->ext - filename extension in lower case
+ * $a->EXT - filename extension, capitalized
+ * $a->Ext - filename extension with first capital letter
+ * $a->mimetype - file mimetype
+ * $a->mimetype1 - first chunk of mimetype (before /)
+ * $a->mimetype2 - second chunk of mimetype (after /)
+ * $a->Mimetype, $a->MIMETYPE, $a->Mimetype1, $a->Mimetype2, $a->MIMETYPE1, $a->MIMETYPE2
+ * - the same with capitalized first/all letters
+ *
+ * @see get_mimetypes_array()
+ * @see get_mimetype_description()
* @package mimetypes
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -25,15 +38,19 @@
$string['application/msword'] = 'Word document';
$string['application/pdf'] = 'PDF document';
+$string['application/vnd.moodle.backup'] = 'Moodle backup';
$string['application/vnd.ms-excel'] = 'Excel spreadsheet';
$string['application/vnd.ms-powerpoint'] = 'Powerpoint presentation';
-$string['application/zip'] = 'zip archive';
-$string['audio/mp3'] = 'MP3 audio file';
-$string['audio/wav'] = 'sound file';
-$string['document/unknown'] = 'file';
-$string['image/bmp'] = 'uncompressed BMP image';
-$string['image/gif'] = 'GIF image';
-$string['image/jpeg'] = 'JPEG image';
-$string['image/png'] = 'PNG image';
-$string['text/plain'] = 'text file';
+$string['application/vnd.openxmlformats-officedocument.presentationml.presentation'] = 'Powerpoint presentation';
+$string['application/vnd.openxmlformats-officedocument.presentationml.slideshow'] = 'Powerpoint slideshow';
+$string['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'] = 'Excel spreadsheet';
+$string['application/vnd.openxmlformats-officedocument.spreadsheetml.template'] = 'Excel template';
+$string['application/vnd.openxmlformats-officedocument.wordprocessingml.document'] = 'Word document';
+$string['archive'] = 'Archive ({$a->EXT})';
+$string['audio'] = 'Audio file ({$a->EXT})';
+$string['default'] = '{$a->mimetype}';
+$string['document/unknown'] = 'File';
+$string['image'] = 'Image ({$a->MIMETYPE2})';
+$string['text/html'] = 'HTML document';
+$string['text/plain'] = 'Text file';
$string['text/rtf'] = 'RTF document';
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index b7cc79e707c..224b7411f87 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -466,8 +466,15 @@ $string['displayonpage'] = 'Display on page';
$string['dndenabled'] = 'Drag and drop available';
$string['dndenabled_help'] = 'You can drag one or more files from your desktop and drop them onto the box below to upload them. Note: this may not work with other web browsers';
$string['dndenabled_insentence'] = 'drag and drop available';
-$string['dndenabled_inbox'] = 'drag and drop files here to upload them';
-$string['dndworking'] = 'Drag and drop files, text or links onto course sections to upload them';
+$string['dndenabled_inbox'] = 'You can drag and drop files here to add them.';
+$string['dnduploadwithoutcontent'] = 'This upload does not have any content';
+$string['dndworkingfiletextlink'] = 'Drag and drop files, text or links onto course sections to upload them';
+$string['dndworkingfilelink'] = 'Drag and drop files or links onto course sections to upload them';
+$string['dndworkingfiletext'] = 'Drag and drop files or text onto course sections to upload them';
+$string['dndworkingfile'] = 'Drag and drop files onto course sections to upload them';
+$string['dndworkingtextlink'] = 'Drag and drop text or links onto course sections to upload them';
+$string['dndworkingtext'] = 'Drag and drop text onto course sections to upload it';
+$string['dndworkinglink'] = 'Drag and drop links onto course sections to upload them';
$string['documentation'] = 'Moodle documentation';
$string['down'] = 'Down';
$string['download'] = 'Download';
@@ -1242,6 +1249,7 @@ $string['olduserdirectory'] = 'This is the OLD users directory, and is no longer
$string['opentoguests'] = 'Guest access';
$string['optional'] = 'optional';
$string['order'] = 'Order';
+$string['originalpath'] = 'Original path';
$string['orphanedactivities'] = 'Orphaned activities';
$string['other'] = 'Other';
$string['outline'] = 'Outline';
diff --git a/lang/en/plugin.php b/lang/en/plugin.php
index 3bc89ef8d37..3bba405afa6 100644
--- a/lang/en/plugin.php
+++ b/lang/en/plugin.php
@@ -31,7 +31,7 @@ $string['checkforupdates'] = 'Check for available updates';
$string['checkforupdateslast'] = 'Last check done on {$a}';
$string['displayname'] = 'Plugin name';
$string['moodleversion'] = 'Moodle {$a}';
-$string['nonehighlighted'] = 'No plugins require your attention during this upgrade';
+$string['nonehighlighted'] = 'No plugins require your attention now';
$string['nonehighlightedinfo'] = 'Display the list of all installed plugins anyway';
$string['noneinstalled'] = 'No plugins of this type are installed';
$string['notes'] = 'Notes';
@@ -52,7 +52,7 @@ $string['requiredby'] = 'Required by: {$a}';
$string['requires'] = 'Requires';
$string['rootdir'] = 'Directory';
$string['settings'] = 'Settings';
-$string['somehighlighted'] = 'Number of plugins requiring attention during this upgrade: {$a}';
+$string['somehighlighted'] = 'Number of plugins requiring your attention: {$a}';
$string['somehighlightedinfo'] = 'Display the full list of installed plugins';
$string['somehighlightedonly'] = 'Display only plugins requiring your attention';
$string['source'] = 'Source';
diff --git a/lang/en/repository.php b/lang/en/repository.php
index 0e84fcd4c64..42c8658591e 100644
--- a/lang/en/repository.php
+++ b/lang/en/repository.php
@@ -61,9 +61,15 @@ $string['commonrepositorysettings'] = 'Common repository settings';
$string['configallowexternallinks'] = 'This option enables all users to choose whether or not external media is copied into Moodle or not. If this is off then media is always copied into Moodle (this is usually best for overall data integrity and security). If this is on then users can choose each time they add media to a text.';
$string['configcacheexpire'] = 'The amount of time that file listings are cached locally (in seconds) when browsing external repositories.';
$string['configsaved'] = 'Configuration saved!';
-$string['confirmdelete'] = 'Are you sure you want to delete this repository - {$a}?';
+$string['confirmdelete'] = 'Are you sure you want to delete this repository - {$a}? If you choose "Continue and download", file references to external contents will be downloaded to moodle, but it could take long time to process.';
$string['confirmdeletefile'] = 'Are you sure you want to delete this file?';
-$string['confirmremove'] = 'Are you sure you want to remove this repository plugin, its options and all of its instances - {$a}?';
+$string['confirmrenamefile'] = 'Are you sure you want to rename/move this file? There are {$a} alias/shortcut files that use this file as their source. If you proceed then those aliases will be converted to true copies.';
+$string['confirmdeletefilewithhref'] = 'Are you sure you want to delete this file? There are {$a} alias/shortcut files that use this file as their source. If you proceed then those aliases will be converted to true copies.';
+$string['confirmdeletefolder'] = 'Are you sure you want to delete this folder? All files and subfolders will be deleted.';
+$string['confirmremove'] = 'Are you sure you want to remove this repository plugin, its options and all of its instances - {$a}? If you choose "Continue and download", file references to external contents will be downloaded to moodle, but it could take long time to process.';
+$string['confirmrenamefolder'] = ' Are you sure you want to move/rename this folder? Any alias/shortcut files that reference files in this folder will be converted into true copies.';
+$string['continueuninstall'] = 'Continue';
+$string['continueuninstallanddownload'] = 'Continue and download';
$string['copying'] = 'Copying';
$string['create'] = 'Create';
$string['createfolderfail'] = 'Fail to create this folder';
@@ -72,8 +78,11 @@ $string['createinstance'] = 'Create a repository instance';
$string['createrepository'] = 'Create a repository instance';
$string['createxxinstance'] = 'Create "{$a}" instance';
$string['date'] = 'Date';
+$string['datecreated'] = 'Created';
$string['deleted'] = 'Repository deleted';
$string['deleterepository'] = 'Delete this repository';
+$string['detailview'] = 'View details';
+$string['dimensions'] = 'Dimensions';
$string['disabled'] = 'Disabled';
$string['download'] = 'Download';
$string['downloadfolder'] = 'Download all';
@@ -102,11 +111,15 @@ $string['filenotnull'] = 'You must select a file to upload.';
$string['filesaved'] = 'The file has been saved';
$string['filepicker'] = 'File picker';
$string['filesizenull'] = 'File size cannot be determined';
+$string['folderexists'] = 'Folder name already being used, please use another name';
+$string['foldernotfound'] = 'Folder not found';
+$string['folderrecurse'] = 'Folder can not be moved to it\s own subfolder';
$string['getfile'] = 'Select this file';
$string['hidden'] = 'Hidden';
$string['choosealink'] = 'Choose a link...';
$string['chooselicense'] = 'Choose license';
$string['iconview'] = 'View as icons';
+$string['imagesize'] = '{$a->width} x {$a->height} px';
$string['instance'] = 'instance';
$string['instancedeleted'] = 'Instance deleted';
$string['instances'] = 'Repository instances';
@@ -117,6 +130,7 @@ $string['invalidjson'] = 'Invalid JSON string';
$string['invalidplugin'] = 'Invalid repository {$a} plug-in';
$string['invalidfiletype'] = '{$a} filetype cannot be accepted.';
$string['invalidrepositoryid'] = 'Invalid repository ID';
+$string['invalidparams'] = 'Invalid parameters';
$string['isactive'] = 'Active?';
$string['keyword'] = 'Keyword';
$string['linkexternal'] = 'Link external';
@@ -124,6 +138,9 @@ $string['listview'] = 'View as list';
$string['loading'] = 'Loading...';
$string['login'] = 'Login';
$string['logout'] = 'Logout';
+$string['makefileinternal'] = 'Make a copy of the file';
+$string['makefilelink'] = 'Link to the file directly';
+$string['makefilereference'] = 'Create an alias/shortcut to the file';
$string['manage'] = 'Manage repositories';
$string['manageurl'] = 'Manage';
$string['manageuserrepository'] = 'Manage individual repository';
@@ -139,6 +156,7 @@ $string['norepositoriesavailable'] = 'Sorry, none of your current repositories c
$string['norepositoriesexternalavailable'] = 'Sorry, none of your current repositories can return external files.';
$string['notyourinstances'] = 'You can not view/edit repository instances of another user';
$string['off'] = 'Enabled but hidden';
+$string['original'] = 'Original';
$string['openpicker'] = 'Choose a file...';
$string['operation'] = 'Operation';
$string['on'] = 'Enabled and visible';
@@ -150,10 +168,12 @@ $string['popup'] = 'Click "Login" button to login';
$string['popupblockeddownload'] = 'The downloading window is blocked, please allow the popup window, and try again.';
$string['preview'] = 'Preview';
$string['readonlyinstance'] = 'You cannot edit/delete a read-only instance';
+$string['referencesexist'] = 'There are {$a} alias/shortcut files that use this file as their source';
+$string['referenceslist'] = 'Aliases/Shortcuts';
$string['refresh'] = 'Refresh';
$string['refreshnonjsfilepicker'] = 'Please close this window and refresh non-javascript file picker';
$string['removed'] = 'Repository removed';
-$string['renameto'] = 'Rename to';
+$string['renameto'] = 'Rename to "{$a}"';
$string['repositories'] = 'Repositories';
$string['repository'] = 'Repository';
$string['repositorycourse'] = 'Course repositories';
@@ -175,10 +195,14 @@ $string['submit'] = 'Submit';
$string['sync'] = 'Sync';
$string['thumbview'] = 'View as icons';
$string['title'] = 'Choose a file...';
+$string['type'] = 'Type';
$string['typenotvisible'] = 'Type not visible';
+$string['unknownoriginal'] = 'Unknown';
$string['upload'] = 'Upload this file';
$string['uploading'] = 'Uploading...';
$string['uploadsucc'] = 'The file has been uploaded successfully';
+$string['undisclosedreference'] = '(Undisclosed)';
+$string['uselatestfile'] = 'Use latest file';
$string['usercontextrepositorydisabled'] = 'You cannot edit this repository in user context';
$string['usenonjsfilemanager'] = 'Open file manager in new window';
$string['usenonjsfilepicker'] = 'Open file picker in new window';
diff --git a/lang/en/webservice.php b/lang/en/webservice.php
index 2b8aefba412..2b72efe56a5 100644
--- a/lang/en/webservice.php
+++ b/lang/en/webservice.php
@@ -25,7 +25,6 @@
$string['accessexception'] = 'Access control exception';
$string['actwebserviceshhdr'] = 'Active web service protocols';
-$string['accesstofunctionnotallowed'] = 'Access to the function {$a}() is not allowed. Please check if a service containing the function is enabled. In the service settings: if the service is restricted check that the user is listed. Still in the service settings check for IP restriction or if the service requires a capability.';
$string['addaservice'] = 'Add service';
$string['addcapabilitytousers'] = 'Check users capability';
$string['addcapabilitytousersdescription'] = 'Users should have two capabilities - webservice:createtoken and a capability matching the protocols used, for example webservice/rest:use, webservice/soap:use. To achieve this, create a web services role with the appropriate capabilities allowed and assign it to the web services user as a system role.';
@@ -76,7 +75,6 @@ $string['enableprotocols'] = 'Enable protocols';
$string['enableprotocolsdescription'] = 'At least one protocol should be enabled. For security reasons, only protocols that are to be used should be enabled.';
$string['enablews'] = 'Enable web services';
$string['enablewsdescription'] = 'Web services must be enabled in Advanced features.';
-$string['enabledirectdownload'] = 'Web service file downloading must be enabled in external service settings';
$string['entertoken'] = 'Enter a security key/token:';
$string['error'] = 'Error: {$a}';
$string['errorcatcontextnotvalid'] = 'You cannot execute functions in the category context (category id:{$a->catid}). The context error message was: {$a->message}';
@@ -107,7 +105,6 @@ $string['invalidextresponse'] = 'Invalid external api response: {$a}';
$string['invalidiptoken'] = 'Invalid token - your IP is not supported';
$string['invalidtimedtoken'] = 'Invalid token - token expired';
$string['invalidtoken'] = 'Invalid token - token not found';
-$string['invalidtokensession'] = 'Invalid session based token - session not found or expired';
$string['iprestriction'] = 'IP restriction';
$string['iprestriction_help'] = 'The user will need to call web service from the listed IPs.';
$string['key'] = 'Key';
@@ -137,7 +134,6 @@ $string['potusers'] = 'Not authorised users';
$string['potusersmatching'] = 'Not authorised users matching';
$string['print'] = 'Print all';
$string['protocol'] = 'Protocol';
-$string['protocolnotallowed'] = 'You are not allowed to use the {$a} protocol (missing capability: webservice/{$a}:use)';
$string['removefunction'] = 'Remove';
$string['removefunctionconfirm'] = 'Do you really want to remove function "{$a->function}" from service "{$a->service}"?';
$string['requireauthentication'] = 'This method requires authentication with xxx permission.';
@@ -174,6 +170,7 @@ $string['serviceusersmatching'] = 'Authorised users matching';
$string['serviceuserssettings'] = 'Change settings for the authorised users';
$string['simpleauthlog'] = 'Simple authentication login';
$string['step'] = 'Step';
+$string['supplyinfo'] = 'More details';
$string['testauserwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Before doing so, login as a user with the moodle/webservice:createtoken capability and obtain the security key (token) via My profile settings. You will use this token in the test client. In the test client, also choose an enabled protocol with the token authentication. WARNING: The functions that you test WILL BE EXECUTED for this user, so be careful what you choose to test!';
$string['testclient'] = 'Web service test client';
$string['testclientdescription'] = '* The web service test client executes the functions for REAL. Do not test functions that you don\'t know. * All existing web service functions are not yet implemented into the test client. * In order to check that a user cannot access some functions, you can test some functions that you didn\'t allow. * To see clearer error messages set the debugging to {$a->mode} into {$a->atag} * Access the {$a->amfatag}.';
@@ -206,8 +203,6 @@ $string['wsaccessuserexpired'] = 'Refused web service access for password expire
$string['wsaccessusernologin'] = 'Refused web service access for nologin authentication username: {$a}';
$string['wsaccessusersuspended'] = 'Refused web service access for suspended username: {$a}';
$string['wsaccessuserunconfirmed'] = 'Refused web service access for unconfirmed username: {$a}';
-$string['wsauthmissing'] = 'The web service authentication plugin is missing.';
-$string['wsauthnotenabled'] = 'The web service authentication plugin is disabled.';
$string['wsclientdoc'] = 'Moodle web service client documentation';
$string['wsdocapi'] = 'API Documentation';
$string['wsdocumentation'] = 'Web service documentation';
diff --git a/lib/completion/completion_aggregation.php b/lib/completion/completion_aggregation.php
index e7a07863781..e6e626a4de9 100644
--- a/lib/completion/completion_aggregation.php
+++ b/lib/completion/completion_aggregation.php
@@ -49,13 +49,16 @@ class completion_aggregation extends data_object {
*/
public $required_fields = array('id', 'course', 'criteriatype', 'method', 'value');
+ /* @var array Array of unique fields, used in where clauses */
+ public $unique_fields = array('course', 'criteriatype');
+
/* @var int Course id */
public $course;
/* @var int Criteria type this aggregation method applies to, or NULL for overall course aggregation */
public $criteriatype;
- /* @var int Aggregation method (COMPLETION_AGGREGATION_* constant)*/
+ /* @var int Aggregation method (COMPLETION_AGGREGATION_* constant) */
public $method;
/* @var mixed Method value */
@@ -98,4 +101,19 @@ class completion_aggregation extends data_object {
$this->method = COMPLETION_AGGREGATION_ALL;
}
}
+
+
+ /**
+ * Save aggregation method to database
+ *
+ * @access public
+ * @return boolean
+ */
+ public function save() {
+ if ($this->id) {
+ return $this->update();
+ } else {
+ return $this->insert();
+ }
+ }
}
diff --git a/lib/completion/completion_completion.php b/lib/completion/completion_completion.php
index 2b5d8bf4bad..e6523eadf26 100644
--- a/lib/completion/completion_completion.php
+++ b/lib/completion/completion_completion.php
@@ -111,7 +111,7 @@ class completion_completion extends data_object {
$this->timeenrolled = $timeenrolled;
}
- $this->_save();
+ return $this->_save();
}
/**
@@ -137,7 +137,7 @@ class completion_completion extends data_object {
$this->timestarted = $timestarted;
}
- $this->_save();
+ return $this->_save();
}
/**
@@ -165,24 +165,24 @@ class completion_completion extends data_object {
$this->timecompleted = $timecomplete;
// Save record
- $this->_save();
+ return $this->_save();
}
/**
* Save course completion status
*
* This method creates a course_completions record if none exists
+ * @access private
+ * @return bool
*/
private function _save() {
- global $DB;
-
if ($this->timeenrolled === null) {
$this->timeenrolled = 0;
}
// Save record
if ($this->id) {
- $this->update();
+ return $this->update();
} else {
// Make sure reaggregate field is not null
if (!$this->reaggregate) {
@@ -191,10 +191,10 @@ class completion_completion extends data_object {
// Make sure timestarted is not null
if (!$this->timestarted) {
- $this->timestarted = 0;
+ $this->timestarted = 0;
}
-
- $this->insert();
+
+ return $this->insert();
}
}
}
diff --git a/lib/completion/completion_criteria.php b/lib/completion/completion_criteria.php
index d93e9a043a2..31f5187edcb 100644
--- a/lib/completion/completion_criteria.php
+++ b/lib/completion/completion_criteria.php
@@ -167,11 +167,11 @@ abstract class completion_criteria extends data_object {
public static function factory($params) {
global $CFG, $COMPLETION_CRITERIA_TYPES;
- if (!isset($params->criteriatype) || !isset($COMPLETION_CRITERIA_TYPES[$params->criteriatype])) {
+ if (!isset($params['criteriatype']) || !isset($COMPLETION_CRITERIA_TYPES[$params['criteriatype']])) {
error('invalidcriteriatype', 'completion');
}
- $class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params->criteriatype];
+ $class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params['criteriatype']];
require_once($CFG->libdir.'/completion/'.$class.'.php');
return new $class($params, false);
diff --git a/lib/completion/completion_criteria_activity.php b/lib/completion/completion_criteria_activity.php
index 409bf42c08f..375c9663cbe 100644
--- a/lib/completion/completion_criteria_activity.php
+++ b/lib/completion/completion_criteria_activity.php
@@ -235,8 +235,7 @@ class completion_criteria_activity extends completion_criteria {
// Loop through completions, and mark as complete
$rs = $DB->get_recordset_sql($sql);
foreach ($rs as $record) {
-
- $completion = new completion_criteria_completion((array)$record);
+ $completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
$completion->mark_complete($record->timecompleted);
}
$rs->close();
diff --git a/lib/completion/completion_criteria_completion.php b/lib/completion/completion_criteria_completion.php
index f4d700d0772..7f448001d20 100644
--- a/lib/completion/completion_criteria_completion.php
+++ b/lib/completion/completion_criteria_completion.php
@@ -44,6 +44,9 @@ class completion_criteria_completion extends data_object {
/* @var array Array of required table fields, must start with 'id'. */
public $required_fields = array('id', 'userid', 'course', 'criteriaid', 'gradefinal', 'rpl', 'deleted', 'unenroled', 'timecompleted');
+ /* @var array Array of unique fields, used in where clauses */
+ public $unique_fields = array('userid', 'course', 'criteriaid');
+
/* @var int User ID */
public $userid;
diff --git a/lib/completion/completion_criteria_course.php b/lib/completion/completion_criteria_course.php
index 882ee6365c2..a25dea2ae6b 100644
--- a/lib/completion/completion_criteria_course.php
+++ b/lib/completion/completion_criteria_course.php
@@ -193,7 +193,7 @@ class completion_criteria_course extends completion_criteria {
// Loop through completions, and mark as complete
$rs = $DB->get_recordset_sql($sql);
foreach ($rs as $record) {
- $completion = new completion_criteria_completion((array)$record);
+ $completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
$completion->mark_complete($record->timecompleted);
}
$rs->close();
diff --git a/lib/completion/completion_criteria_date.php b/lib/completion/completion_criteria_date.php
index e6e81c09148..baecc20f420 100644
--- a/lib/completion/completion_criteria_date.php
+++ b/lib/completion/completion_criteria_date.php
@@ -179,7 +179,7 @@ class completion_criteria_date extends completion_criteria {
// Loop through completions, and mark as complete
$rs = $DB->get_recordset_sql($sql, array(time()));
foreach ($rs as $record) {
- $completion = new completion_criteria_completion((array)$record);
+ $completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
$completion->mark_complete($record->timeend);
}
$rs->close();
diff --git a/lib/completion/completion_criteria_duration.php b/lib/completion/completion_criteria_duration.php
index 97bcb923b00..ead1a556c2b 100644
--- a/lib/completion/completion_criteria_duration.php
+++ b/lib/completion/completion_criteria_duration.php
@@ -229,8 +229,7 @@ class completion_criteria_duration extends completion_criteria {
$now = time();
$rs = $DB->get_recordset_sql($sql, array($now, $now));
foreach ($rs as $record) {
-
- $completion = new completion_criteria_completion((array)$record);
+ $completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
// Use time start if not 0, otherwise use timeenrolled
if ($record->otimestart) {
diff --git a/lib/completion/completion_criteria_grade.php b/lib/completion/completion_criteria_grade.php
index e452454d080..6bc32ed7236 100644
--- a/lib/completion/completion_criteria_grade.php
+++ b/lib/completion/completion_criteria_grade.php
@@ -215,7 +215,7 @@ class completion_criteria_grade extends completion_criteria {
// Loop through completions, and mark as complete
$rs = $DB->get_recordset_sql($sql);
foreach ($rs as $record) {
- $completion = new completion_criteria_completion((array)$record);
+ $completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
$completion->mark_complete($record->timecompleted);
}
$rs->close();
diff --git a/lib/completion/cron.php b/lib/completion/cron.php
index be480d47a21..3645c0618d6 100644
--- a/lib/completion/cron.php
+++ b/lib/completion/cron.php
@@ -317,7 +317,7 @@ function completion_cron_completions() {
foreach ($completions as $params) {
$timecompleted = max($timecompleted, $params->timecompleted);
- $completion = new completion_criteria_completion($params, false);
+ $completion = new completion_criteria_completion((array)$params, false);
// Handle aggregation special cases
if ($params->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) {
diff --git a/lib/completion/data_object.php b/lib/completion/data_object.php
index 01345ee0cc9..9d862ba914a 100644
--- a/lib/completion/data_object.php
+++ b/lib/completion/data_object.php
@@ -26,6 +26,14 @@
defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Trigger for the new data_object api.
+ *
+ * See data_object::__constructor
+ */
+define('DATA_OBJECT_FETCH_BY_KEY', 2);
+
/**
* A data abstraction object that holds methods and attributes
*
@@ -50,32 +58,74 @@ abstract class data_object {
*/
public $optional_fields = array();
+ /* @var Array of unique fields, used in where clauses and constructor */
+ public $unique_fields = array();
+
/* @var int The primary key */
public $id;
+
/**
* Constructor. Optionally (and by default) attempts to fetch corresponding row from DB.
*
- * @param array $params an array with required parameters for this data object.
- * @param bool $fetch Whether to fetch corresponding row from DB or not,
- * optional fields might not be defined if false used
+ * If $fetch is not false, there are a few different things that can happen:
+ * - true:
+ * load corresponding row from the database, using $params as the WHERE clause
+ *
+ * - DATA_OBJECT_FETCH_BY_KEY:
+ * load corresponding row from the database, using only the $id in the WHERE clause (if set),
+ * otherwise using the columns listed in $this->unique_fields.
+ *
+ * - array():
+ * load corresponding row from the database, using the columns listed in this array
+ * in the WHERE clause
+ *
+ * @param array $params required parameters and their values for this data object
+ * @param mixed $fetch if false, do not attempt to fetch from the database, otherwise see notes
*/
public function __construct($params = null, $fetch = true) {
- if (!empty($params) and (is_array($params) or is_object($params))) {
- if ($fetch) {
- if ($data = $this->fetch($params)) {
- self::set_properties($this, $data);
- } else {
- self::set_properties($this, $this->optional_fields);//apply defaults for optional fields
- self::set_properties($this, $params);
- }
- } else {
- self::set_properties($this, $params);
+ if (is_object($params)) {
+ throw new coding_exception('data_object params should be in the form of an array, not an object');
+ }
+
+ // If no params given, apply defaults for optional fields
+ if (empty($params) || !is_array($params)) {
+ self::set_properties($this, $this->optional_fields);
+ return;
+ }
+
+ // If fetch is false, do not load from database
+ if ($fetch === false) {
+ self::set_properties($this, $params);
+ return;
+ }
+
+ // Compose where clause only from fields in unique_fields
+ if ($fetch === DATA_OBJECT_FETCH_BY_KEY && !empty($this->unique_fields)) {
+ if (empty($params['id'])) {
+ $where = array_intersect_key($params, array_flip($this->unique_fields));
}
-
+ else {
+ $where = array('id' => $params['id']);
+ }
+ // Compose where clause from given field names
+ } else if (is_array($fetch) && !empty($fetch)) {
+ $where = array_intersect_key($params, array_flip($fetch));
+ // Use entire params array for where clause
} else {
- self::set_properties($this, $this->optional_fields);//apply defaults for optional fields
+ $where = $params;
+ }
+
+ // Attempt to load from database
+ if ($data = $this->fetch($where)) {
+ // Apply data from database, then data sent to constructor
+ self::set_properties($this, $data);
+ self::set_properties($this, $params);
+ } else {
+ // Apply defaults for optional fields, then data from constructor
+ self::set_properties($this, $this->optional_fields);
+ self::set_properties($this, $params);
}
}
@@ -339,4 +389,4 @@ abstract class data_object {
*/
public function notify_changed($deleted) {
}
-}
\ No newline at end of file
+}
diff --git a/lib/completionlib.php b/lib/completionlib.php
index a47a1f89ee2..2034af148f5 100644
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -322,8 +322,9 @@ class completion_info {
*/
public function get_user_completion($user_id, $criteria) {
$params = array(
+ 'course' => $this->course_id,
+ 'userid' => $user_id,
'criteriaid' => $criteria->id,
- 'userid' => $user_id
);
$completion = new completion_criteria_completion($params);
@@ -362,7 +363,7 @@ class completion_info {
// Build array of criteria objects
$this->criteria = array();
foreach ($records as $record) {
- $this->criteria[$record->id] = completion_criteria::factory($record);
+ $this->criteria[$record->id] = completion_criteria::factory((array)$record);
}
}
diff --git a/lib/conditionlib.php b/lib/conditionlib.php
index 9bcd4bbe5d2..0d8b3cbfde7 100644
--- a/lib/conditionlib.php
+++ b/lib/conditionlib.php
@@ -69,7 +69,8 @@ class condition_info extends condition_info_base {
* @param object $cm Moodle course-module object. May have extra fields
* ->conditionsgrade, ->conditionscompletion which should come from
* get_fast_modinfo. Should have ->availablefrom, ->availableuntil,
- * and ->showavailability, ->course; but the only required thing is ->id.
+ * and ->showavailability, ->course, ->visible; but the only required
+ * thing is ->id.
* @param int $expectingmissing Used to control whether or not a developer
* debugging message (performance warning) will be displayed if some of
* the above data is missing and needs to be retrieved; a
@@ -426,7 +427,8 @@ abstract class condition_info_base {
* @return array Array of field names
*/
protected function get_main_table_fields() {
- return array('id', 'course', 'availablefrom', 'availableuntil', 'showavailability');
+ return array('id', 'course', 'visible',
+ 'availablefrom', 'availableuntil', 'showavailability');
}
/**
@@ -846,6 +848,16 @@ abstract class condition_info_base {
}
}
+ // If the item is marked as 'not visible' then we don't change the available
+ // flag (visible/available are treated distinctly), but we remove any
+ // availability info. If the item is hidden with the eye icon, it doesn't
+ // make sense to show 'Available from ' or similar, because even
+ // when that date arrives it will still not be available unless somebody
+ // toggles the eye icon.
+ if (!$this->item->visible) {
+ $information = '';
+ }
+
$information = trim($information);
return $available;
}
diff --git a/lib/cronlib.php b/lib/cronlib.php
index b05e34f87c9..f89adbd6d06 100644
--- a/lib/cronlib.php
+++ b/lib/cronlib.php
@@ -376,7 +376,7 @@ function cron_run() {
//Run registration updated cron
mtrace(get_string('siteupdatesstart', 'hub'));
- require_once($CFG->dirroot . '/admin/registration/lib.php');
+ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
$registrationmanager = new registration_manager();
$registrationmanager->cron();
mtrace(get_string('siteupdatesend', 'hub'));
@@ -403,9 +403,7 @@ function cron_run() {
cron_execute_plugin_type('format', 'course formats');
cron_execute_plugin_type('profilefield', 'profile fields');
cron_execute_plugin_type('webservice', 'webservices');
- // TODO: Repository lib.php files are messed up (include many other files, etc), so it is
- // currently not possible to implement repository plugin cron using this infrastructure
- // cron_execute_plugin_type('repository', 'repository plugins');
+ cron_execute_plugin_type('repository', 'repository plugins');
cron_execute_plugin_type('qbehaviour', 'question behaviours');
cron_execute_plugin_type('qformat', 'question import/export formats');
cron_execute_plugin_type('qtype', 'question types');
@@ -462,6 +460,9 @@ function cron_run() {
$fs = get_file_storage();
$fs->cron();
+ mtrace("Clean up cached external files");
+ // 1 week
+ cache_file::cleanup(array(), 60 * 60 * 24 * 7);
mtrace("Cron script completed correctly");
diff --git a/lib/db/install.php b/lib/db/install.php
index f0bb45df6f9..b3e9aa23c88 100644
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -319,8 +319,9 @@ function xmldb_main_install() {
set_role_contextlevels($guestrole, get_default_contextlevels('guest'));
set_role_contextlevels($userrole, get_default_contextlevels('user'));
- // Init themes
- set_config('themerev', 1);
+ // Init theme and JS revisions
+ set_config('themerev', time());
+ set_config('jsrev', time());
// Install licenses
require_once($CFG->libdir . '/licenselib.php');
diff --git a/lib/db/install.xml b/lib/db/install.xml
index 1d83d84ead5..d4b707752f3 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
-
@@ -149,7 +149,8 @@
-
+
+
-
\ No newline at end of file
+
diff --git a/lib/db/log.php b/lib/db/log.php
index f404e019e0c..f0475f62870 100644
--- a/lib/db/log.php
+++ b/lib/db/log.php
@@ -38,6 +38,7 @@ global $DB; // TODO: this is a hack, we should really do something with the SQL
$logs = array(
array('module'=>'course', 'action'=>'user report', 'mtable'=>'user', 'field'=>$DB->sql_concat('firstname', "' '" , 'lastname')),
array('module'=>'course', 'action'=>'view', 'mtable'=>'course', 'field'=>'fullname'),
+ array('module'=>'course', 'action'=>'view section', 'mtable'=>'course_sections', 'field'=>'COALESCE(name, section)'),
array('module'=>'course', 'action'=>'update', 'mtable'=>'course', 'field'=>'fullname'),
array('module'=>'course', 'action'=>'enrol', 'mtable'=>'course', 'field'=>'fullname'), // there should be some way to store user id of the enrolled user!
array('module'=>'course', 'action'=>'unenrol', 'mtable'=>'course', 'field'=>'fullname'), // there should be some way to store user id of the enrolled user!
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index b263a39e735..ba53f99374e 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -592,5 +592,182 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012051100.03);
}
+ if ($oldversion < 2012052100.00) {
+
+ // Define field referencefileid to be added to files.
+ $table = new xmldb_table('files');
+
+ // Define field referencefileid to be added to files.
+ $field = new xmldb_field('referencefileid', XMLDB_TYPE_INTEGER, '10', null, null, null, null, 'sortorder');
+
+ // Conditionally launch add field referencefileid.
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+
+ // Define field referencelastsync to be added to files.
+ $field = new xmldb_field('referencelastsync', XMLDB_TYPE_INTEGER, '10', null, null, null, null, 'referencefileid');
+
+ // Conditionally launch add field referencelastsync.
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+
+ // Define field referencelifetime to be added to files.
+ $field = new xmldb_field('referencelifetime', XMLDB_TYPE_INTEGER, '10', null, null, null, null, 'referencelastsync');
+
+ // Conditionally launch add field referencelifetime.
+ if (!$dbman->field_exists($table, $field)) {
+ $dbman->add_field($table, $field);
+ }
+
+ $key = new xmldb_key('referencefileid', XMLDB_KEY_FOREIGN, array('referencefileid'), 'files_reference', array('id'));
+ // Launch add key referencefileid
+ $dbman->add_key($table, $key);
+
+ // Define table files_reference to be created.
+ $table = new xmldb_table('files_reference');
+
+ // Adding fields to table files_reference.
+ $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
+ $table->add_field('repositoryid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null);
+ $table->add_field('lastsync', XMLDB_TYPE_INTEGER, '10', null, null, null, null);
+ $table->add_field('lifetime', XMLDB_TYPE_INTEGER, '10', null, null, null, null);
+ $table->add_field('reference', XMLDB_TYPE_TEXT, null, null, null, null, null);
+
+ // Adding keys to table files_reference.
+ $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
+ $table->add_key('repositoryid', XMLDB_KEY_FOREIGN, array('repositoryid'), 'repository_instances', array('id'));
+
+ // Conditionally launch create table for files_reference
+ if (!$dbman->table_exists($table)) {
+ $dbman->create_table($table);
+ }
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052100.00);
+ }
+
+ if ($oldversion < 2012052500.03) { // fix invalid course_completion_records MDL-27368
+ //first get all instances of duplicate records
+ $sql = 'SELECT userid, course FROM {course_completions} WHERE (deleted IS NULL OR deleted <> 1) GROUP BY userid, course HAVING (count(id) > 1)';
+ $duplicates = $DB->get_recordset_sql($sql, array());
+
+ foreach ($duplicates as $duplicate) {
+ $pointer = 0;
+ //now get all the records for this user/course
+ $sql = 'userid = ? AND course = ? AND (deleted IS NULL OR deleted <> 1)';
+ $completions = $DB->get_records_select('course_completions', $sql,
+ array($duplicate->userid, $duplicate->course), 'timecompleted DESC, timestarted DESC');
+ $needsupdate = false;
+ $origcompletion = null;
+ foreach ($completions as $completion) {
+ $pointer++;
+ if ($pointer === 1) { //keep 1st record but delete all others.
+ $origcompletion = $completion;
+ } else {
+ //we need to keep the "oldest" of all these fields as the valid completion record.
+ $fieldstocheck = array('timecompleted', 'timestarted', 'timeenrolled');
+ foreach ($fieldstocheck as $f) {
+ if ($origcompletion->$f > $completion->$f) {
+ $origcompletion->$f = $completion->$f;
+ $needsupdate = true;
+ }
+ }
+ $DB->delete_records('course_completions', array('id'=>$completion->id));
+ }
+ }
+ if ($needsupdate) {
+ $DB->update_record('course_completions', $origcompletion);
+ }
+ }
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052500.03);
+ }
+
+ if ($oldversion < 2012052900.00) {
+ // Clean up all duplicate records in the course_completions table in preparation
+ // for adding a new index there.
+ upgrade_course_completion_remove_duplicates(
+ 'course_completions',
+ array('userid', 'course'),
+ array('timecompleted', 'timestarted', 'timeenrolled')
+ );
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052900.00);
+ }
+
+ if ($oldversion < 2012052900.01) {
+ // Add indexes to prevent new duplicates in the course_completions table.
+ // Define index useridcourse (unique) to be added to course_completions
+ $table = new xmldb_table('course_completions');
+ $index = new xmldb_index('useridcourse', XMLDB_INDEX_UNIQUE, array('userid', 'course'));
+
+ // Conditionally launch add index useridcourse
+ if (!$dbman->index_exists($table, $index)) {
+ $dbman->add_index($table, $index);
+ }
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052900.01);
+ }
+
+ if ($oldversion < 2012052900.02) {
+ // Clean up all duplicate records in the course_completion_crit_compl table in preparation
+ // for adding a new index there.
+ upgrade_course_completion_remove_duplicates(
+ 'course_completion_crit_compl',
+ array('userid', 'course', 'criteriaid'),
+ array('timecompleted')
+ );
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052900.02);
+ }
+
+ if ($oldversion < 2012052900.03) {
+ // Add indexes to prevent new duplicates in the course_completion_crit_compl table.
+ // Define index useridcoursecriteraid (unique) to be added to course_completion_crit_compl
+ $table = new xmldb_table('course_completion_crit_compl');
+ $index = new xmldb_index('useridcoursecriteraid', XMLDB_INDEX_UNIQUE, array('userid', 'course', 'criteriaid'));
+
+ // Conditionally launch add index useridcoursecriteraid
+ if (!$dbman->index_exists($table, $index)) {
+ $dbman->add_index($table, $index);
+ }
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052900.03);
+ }
+
+ if ($oldversion < 2012052900.04) {
+ // Clean up all duplicate records in the course_completion_aggr_methd table in preparation
+ // for adding a new index there.
+ upgrade_course_completion_remove_duplicates(
+ 'course_completion_aggr_methd',
+ array('course', 'criteriatype')
+ );
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052900.04);
+ }
+
+ if ($oldversion < 2012052900.05) {
+ // Add indexes to prevent new duplicates in the course_completion_aggr_methd table.
+ // Define index coursecriteratype (unique) to be added to course_completion_aggr_methd
+ $table = new xmldb_table('course_completion_aggr_methd');
+ $index = new xmldb_index('coursecriteriatype', XMLDB_INDEX_UNIQUE, array('course', 'criteriatype'));
+
+ // Conditionally launch add index coursecriteratype
+ if (!$dbman->index_exists($table, $index)) {
+ $dbman->add_index($table, $index);
+ }
+
+ // Main savepoint reached
+ upgrade_main_savepoint(true, 2012052900.05);
+ }
+
return true;
-}
+}
\ No newline at end of file
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
index 028538c4f2e..5ae728e86c6 100644
--- a/lib/dml/mssql_native_moodle_database.php
+++ b/lib/dml/mssql_native_moodle_database.php
@@ -826,7 +826,7 @@ class mssql_native_moodle_database extends moodle_database {
} else {
unset($params['id']);
if ($returnid) {
- $returning = "; SELECT SCOPE_IDENTITY()";
+ $returning = "OUTPUT inserted.id";
}
}
@@ -838,18 +838,29 @@ class mssql_native_moodle_database extends moodle_database {
$qms = array_fill(0, count($params), '?');
$qms = implode(',', $qms);
- $sql = "INSERT INTO {" . $table . "} ($fields) VALUES($qms) $returning";
+ $sql = "INSERT INTO {" . $table . "} ($fields) $returning VALUES ($qms)";
list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
$rawsql = $this->emulate_bound_params($sql, $params);
$this->query_start($sql, $params, SQL_QUERY_INSERT);
$result = mssql_query($rawsql, $this->mssql);
- $this->query_end($result);
+ // Expected results are:
+ // - true: insert ok and there isn't returned information.
+ // - false: insert failed and there isn't returned information.
+ // - resource: insert executed, need to look for returned (output)
+ // values to know if the insert was ok or no. Posible values
+ // are false = failed, integer = insert ok, id returned.
+ $end = false;
+ if (is_bool($result)) {
+ $end = $result;
+ } else if (is_resource($result)) {
+ $end = mssql_result($result, 0, 0); // Fetch 1st column from 1st row.
+ }
+ $this->query_end($end); // End the query with the calculated $end.
if ($returning !== "") {
- $row = mssql_fetch_assoc($result);
- $params['id'] = reset($row);
+ $params['id'] = $end;
}
$this->free_result($result);
diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php
index 0ef6eca624d..410c7ffef3b 100644
--- a/lib/dml/tests/dml_test.php
+++ b/lib/dml/tests/dml_test.php
@@ -2078,6 +2078,34 @@ class dml_testcase extends database_driver_testcase {
$this->assertEquals(1e-300, $DB->get_field($tablename, 'onetext', array('id' => $id)));
$id = $DB->insert_record($tablename, array('onetext' => 1e300));
$this->assertEquals(1e300, $DB->get_field($tablename, 'onetext', array('id' => $id)));
+
+ // Test that inserting data violating one unique key leads to error.
+ // Empty the table completely.
+ $this->assertTrue($DB->delete_records($tablename));
+
+ // Add one unique constraint (index).
+ $key = new xmldb_key('testuk', XMLDB_KEY_UNIQUE, array('course', 'oneint'));
+ $dbman->add_key($table, $key);
+
+ // Let's insert one record violating the constraint multiple times.
+ $record = (object)array('course' => 1, 'oneint' => 1);
+ $this->assertTrue($DB->insert_record($tablename, $record, false)); // insert 1st. No problem expected.
+
+ // Re-insert same record, not returning id. dml_exception expected.
+ try {
+ $DB->insert_record($tablename, $record, false);
+ $this->fail("Expecting an exception, none occurred");
+ } catch (exception $e) {
+ $this->assertTrue($e instanceof dml_exception);
+ }
+
+ // Re-insert same record, returning id. dml_exception expected.
+ try {
+ $DB->insert_record($tablename, $record, true);
+ $this->fail("Expecting an exception, none occurred");
+ } catch (exception $e) {
+ $this->assertTrue($e instanceof dml_exception);
+ }
}
public function test_import_record() {
diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index 885af159a10..01537e912e7 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -28,7 +28,7 @@ defined('MOODLE_INTERNAL') || die();
class tinymce_texteditor extends texteditor {
/** @var string active version - directory name */
- public $version = '3.5';
+ public $version = '3.5.1.1';
public function supported_by_browser() {
if (check_browser_version('MSIE', 6)) {
diff --git a/lib/editor/tinymce/tiny_mce/3.5/jquery.tinymce.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/jquery.tinymce.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/jquery.tinymce.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/jquery.tinymce.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/license.txt b/lib/editor/tinymce/tiny_mce/3.5.1.1/license.txt
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/license.txt
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/license.txt
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/css/advhr.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/css/advhr.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/css/advhr.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/css/advhr.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/js/rule.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/js/rule.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/js/rule.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/js/rule.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/rule.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/rule.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advhr/rule.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advhr/rule.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/css/advimage.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/css/advimage.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/css/advimage.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/css/advimage.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/image.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/image.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/image.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/image.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/img/sample.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/img/sample.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/img/sample.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/img/sample.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/js/image.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/js/image.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/js/image.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/js/image.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advimage/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advimage/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/css/advlink.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/css/advlink.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/css/advlink.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/css/advlink.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/js/advlink.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/js/advlink.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/js/advlink.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/js/advlink.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/link.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/link.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlink/link.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlink/link.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/advlist/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/advlist/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin.js
new file mode 100644
index 00000000000..17f825b1bdb
--- /dev/null
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autolink/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin_src.js
similarity index 93%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autolink/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin_src.js
index 2dd4c696034..87670517192 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/plugins/autolink/editor_plugin_src.js
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autolink/editor_plugin_src.js
@@ -61,7 +61,7 @@
// We need at least five characters to form a URL,
// hence, at minimum, five characters from the beginning of the line.
- r = ed.selection.getRng().cloneRange();
+ r = ed.selection.getRng(true).cloneRange();
if (r.startOffset < 5) {
// During testing, the caret is placed inbetween two text nodes.
// The previous text node contains the URL.
@@ -124,13 +124,19 @@
r.setEnd(endContainer, start);
}
+ // Exclude last . from word like "www.site.com."
+ var text = r.toString();
+ if (text.charAt(text.length - 1) == '.') {
+ r.setEnd(endContainer, start - 1);
+ }
+
text = r.toString();
- matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);
+ matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);
if (matches) {
if (matches[1] == 'www.') {
matches[1] = 'http://www.';
- } else if (/@$/.test(matches[1])) {
+ } else if (/@$/.test(matches[1]) && !/^mailto:/.test(matches[1])) {
matches[1] = 'mailto:' + matches[1];
}
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autoresize/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autoresize/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/autosave/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/autosave/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/bbcode/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/bbcode/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/contextmenu/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/contextmenu/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/directionality/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/directionality/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/dragmath.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/dragmath.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/dragmath.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/dragmath.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/img/dragmath.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/img/dragmath.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/img/dragmath.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/img/dragmath.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/js/dragmath.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/js/dragmath.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/js/dragmath.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/js/dragmath.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/dragmath/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/dragmath/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/emotions.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/emotions.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/emotions.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/emotions.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cool.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cool.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cool.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cool.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cry.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cry.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-cry.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-cry.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-embarassed.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-embarassed.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-embarassed.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-embarassed.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-foot-in-mouth.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-foot-in-mouth.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-foot-in-mouth.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-frown.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-frown.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-frown.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-frown.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-innocent.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-innocent.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-innocent.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-innocent.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-kiss.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-kiss.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-kiss.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-kiss.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-laughing.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-laughing.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-laughing.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-laughing.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-money-mouth.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-money-mouth.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-money-mouth.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-sealed.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-sealed.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-sealed.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-sealed.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-smile.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-smile.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-smile.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-smile.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-surprised.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-surprised.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-surprised.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-surprised.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-tongue-out.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-tongue-out.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-tongue-out.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-undecided.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-undecided.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-undecided.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-undecided.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-wink.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-wink.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-wink.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-wink.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-yell.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-yell.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/img/smiley-yell.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/img/smiley-yell.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/js/emotions.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/js/emotions.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/js/emotions.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/js/emotions.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/emotions/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/emotions/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/dialog.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/dialog.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/dialog.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/dialog.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/img/example.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/img/example.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/img/example.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/img/example.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/js/dialog.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/js/dialog.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/js/dialog.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/js/dialog.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/example_dependency/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/example_dependency/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/css/fullpage.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/css/fullpage.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/css/fullpage.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/css/fullpage.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/fullpage.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/fullpage.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/fullpage.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/fullpage.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/js/fullpage.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/js/fullpage.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/js/fullpage.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/js/fullpage.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullpage/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullpage/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/fullscreen.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/fullscreen.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/fullscreen/fullscreen.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/fullscreen/fullscreen.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/iespell/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/iespell/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/button.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/button.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/button.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/window.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/window.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/skins/clearlooks2/window.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/skins/clearlooks2/window.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/template.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/template.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/inlinepopups/template.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/inlinepopups/template.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/insertdatetime/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/insertdatetime/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/layer/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/layer/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/legacyoutput/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/legacyoutput/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/lists/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/lists/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/css/media.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/css/media.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/css/media.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/css/media.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/embed.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/embed.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/embed.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/embed.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/media.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/media.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/js/media.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/js/media.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/media.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/media.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/media.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/media.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/media/moxieplayer.swf b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/moxieplayer.swf
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/media/moxieplayer.swf
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/media/moxieplayer.swf
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/dialog.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/dialog.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/dialog.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/dialog.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/img/moodleemoticon.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/img/moodleemoticon.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/img/moodleemoticon.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/img/moodleemoticon.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/js/dialog.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/js/dialog.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodleemoticon/js/dialog.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodleemoticon/js/dialog.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/css/media.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/css/media.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/css/media.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/css/media.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/img/icon.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/img/icon.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/img/icon.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/img/icon.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/js/media.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/js/media.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/moodlemedia.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/moodlemedia.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/moodlemedia.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/moodlemedia.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/preview.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php
similarity index 77%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/preview.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php
index 431b077687c..f26251a5c81 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlemedia/preview.php
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php
@@ -25,6 +25,8 @@
require(dirname(__FILE__) . '/../../../../../../../config.php');
require_once($CFG->libdir . '/filelib.php');
+require_once($CFG->libdir . '/editorlib.php');
+require_once($CFG->libdir . '/editor/tinymce/lib.php');
// Must be logged in
require_login();
@@ -32,9 +34,11 @@ require_login();
// Require path to draftfile.php file
$path = required_param('path', PARAM_PATH);
+$editor = new tinymce_texteditor();
+
// Now output this file which is super-simple
$PAGE->set_pagelayout('embedded');
-$PAGE->set_url(new moodle_url('/lib/editor/tinymce/tiny_mce/3.4.6/plugins/moodlemedia/preview.php',
+$PAGE->set_url(new moodle_url('/lib/editor/tinymce/tiny_mce/'.$editor->version.'/plugins/moodlemedia/preview.php',
array('path' => $path)));
$PAGE->set_context(context_system::instance());
$PAGE->add_body_class('core_media_preview');
@@ -42,7 +46,15 @@ $PAGE->add_body_class('core_media_preview');
echo $OUTPUT->header();
$mediarenderer = $PAGE->get_renderer('core', 'media');
-$url = new moodle_url('/draftfile.php/' . $path);
+
+$path = '/'.trim($path, '/');
+
+if (empty($CFG->slasharguments)) {
+ $url = new moodle_url('/draftfile.php', array('file'=>$path));
+} else {
+ $url = new moodle_url('/draftfile.php');
+ $url->set_slashargument($path);
+}
if ($mediarenderer->can_embed_url($url)) {
echo $mediarenderer->embed_url($url);
}
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/img/ed_nolink.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/img/ed_nolink.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/img/ed_nolink.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/img/ed_nolink.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/langs/en.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/langs/en.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/moodlenolink/langs/en.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlenolink/langs/en.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/nonbreaking/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/nonbreaking/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/noneditable/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/noneditable/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/pagebreak/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/pagebreak/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pastetext.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pastetext.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pastetext.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pastetext.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pasteword.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pasteword.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/js/pasteword.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/js/pasteword.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pastetext.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pastetext.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pastetext.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pastetext.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pasteword.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pasteword.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/paste/pasteword.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/paste/pasteword.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/example.html b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/example.html
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/example.html
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/example.html
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/jscripts/embed.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/jscripts/embed.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/jscripts/embed.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/jscripts/embed.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/preview/preview.html b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/preview.html
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/preview/preview.html
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/preview/preview.html
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/print/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/print/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/save/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/save/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/css/searchreplace.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/css/searchreplace.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/css/searchreplace.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/css/searchreplace.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/js/searchreplace.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/js/searchreplace.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/js/searchreplace.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/js/searchreplace.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/searchreplace.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/searchreplace.htm
similarity index 96%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/searchreplace.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/searchreplace.htm
index fe711759598..ae81d40dccc 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/plugins/searchreplace/searchreplace.htm
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/searchreplace/searchreplace.htm
@@ -93,7 +93,7 @@
-
+
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/changelog.txt b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/changelog.txt
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/changelog.txt
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/changelog.txt
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/EnchantSpell.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/EnchantSpell.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/EnchantSpell.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/EnchantSpell.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/GoogleSpell.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/GoogleSpell.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/GoogleSpell.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/GoogleSpell.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/PSpell.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/PSpell.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/PSpell.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/PSpell.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/PSpellShell.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/PSpellShell.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/PSpellShell.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/PSpellShell.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/SpellChecker.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/SpellChecker.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/SpellChecker.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/SpellChecker.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/utils/JSON.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/utils/JSON.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/utils/JSON.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/utils/JSON.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/utils/Logger.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/utils/Logger.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/classes/utils/Logger.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/classes/utils/Logger.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/config.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/config.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/config.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/config.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/css/content.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/css/content.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/css/content.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/css/content.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/img/wline.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/img/wline.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/img/wline.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/img/wline.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/includes/general.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/includes/general.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/includes/general.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/includes/general.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/rpc.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/rpc.php
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/spellchecker/rpc.php
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/spellchecker/rpc.php
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/css/props.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/css/props.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/css/props.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/css/props.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/js/props.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/js/props.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/js/props.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/js/props.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/props.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/props.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/props.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/props.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/style/readme.txt b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/readme.txt
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/style/readme.txt
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/style/readme.txt
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/tabfocus/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/tabfocus/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/tabfocus/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/tabfocus/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/tabfocus/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/tabfocus/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/tabfocus/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/tabfocus/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/cell.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/cell.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/cell.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/cell.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/css/cell.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/css/cell.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/css/cell.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/css/cell.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/css/row.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/css/row.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/css/row.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/css/row.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/css/table.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/css/table.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/css/table.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/css/table.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/cell.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/cell.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/cell.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/cell.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/merge_cells.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/merge_cells.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/merge_cells.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/merge_cells.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/row.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/row.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/row.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/row.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/table.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/table.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/js/table.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/js/table.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/merge_cells.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/merge_cells.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/merge_cells.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/merge_cells.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/row.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/row.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/row.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/row.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/table/table.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/table.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/table/table.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/table/table.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/blank.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/blank.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/blank.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/blank.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/css/template.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/css/template.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/css/template.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/css/template.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/js/template.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/js/template.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/js/template.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/js/template.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/template/template.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/template.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/template/template.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/template/template.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/css/visualblocks.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/css/visualblocks.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/css/visualblocks.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/css/visualblocks.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/address.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/address.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/address.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/address.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/article.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/article.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/article.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/article.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/aside.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/aside.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/aside.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/aside.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/blockquote.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/blockquote.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/blockquote.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/blockquote.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/div.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/div.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/div.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/div.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/figure.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/figure.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/figure.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/figure.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h1.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h1.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h1.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h1.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h2.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h2.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h2.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h2.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h3.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h3.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h3.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h3.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h4.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h4.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h4.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h4.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h5.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h5.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h5.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h5.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h6.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h6.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/h6.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/h6.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/hgroup.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/hgroup.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/hgroup.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/hgroup.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/p.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/p.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/p.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/p.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/pre.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/pre.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/pre.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/pre.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/section.gif b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/section.gif
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualblocks/img/section.gif
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualblocks/img/section.gif
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualchars/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualchars/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualchars/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualchars/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/visualchars/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualchars/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/visualchars/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/visualchars/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/wordcount/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/wordcount/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/wordcount/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/wordcount/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/wordcount/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/wordcount/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/wordcount/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/wordcount/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/abbr.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/abbr.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/abbr.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/abbr.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/acronym.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/acronym.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/acronym.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/acronym.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/attributes.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/attributes.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/attributes.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/attributes.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/cite.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/cite.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/cite.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/cite.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/css/attributes.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/css/attributes.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/css/attributes.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/css/attributes.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/css/popup.css b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/css/popup.css
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/css/popup.css
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/css/popup.css
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/del.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/del.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/del.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/del.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/editor_plugin.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/editor_plugin.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/editor_plugin.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/editor_plugin.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/editor_plugin_src.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/editor_plugin_src.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/editor_plugin_src.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/editor_plugin_src.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/ins.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/ins.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/ins.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/ins.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/abbr.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/abbr.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/abbr.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/abbr.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/acronym.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/acronym.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/acronym.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/acronym.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/attributes.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/attributes.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/attributes.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/attributes.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/cite.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/cite.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/cite.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/cite.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/del.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/del.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/del.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/del.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/element_common.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/element_common.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/element_common.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/element_common.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/ins.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/ins.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/js/ins.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/js/ins.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/langs/en_dlg.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/langs/en_dlg.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/plugins/xhtmlxtras/langs/en_dlg.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/xhtmlxtras/langs/en_dlg.js
diff --git a/lib/editor/tinymce/tiny_mce/3.5/themes/advanced/about.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/about.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/themes/advanced/about.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/about.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/themes/advanced/anchor.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/anchor.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/themes/advanced/anchor.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/anchor.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/themes/advanced/charmap.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/charmap.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/themes/advanced/charmap.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/charmap.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/themes/advanced/color_picker.htm b/lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/color_picker.htm
similarity index 100%
rename from lib/editor/tinymce/tiny_mce/3.5/themes/advanced/color_picker.htm
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/color_picker.htm
diff --git a/lib/editor/tinymce/tiny_mce/3.5/themes/advanced/editor_template.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/editor_template.js
similarity index 76%
rename from lib/editor/tinymce/tiny_mce/3.5/themes/advanced/editor_template.js
rename to lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/editor_template.js
index 5e9deec8926..e7ae8ab0910 100644
--- a/lib/editor/tinymce/tiny_mce/3.5/themes/advanced/editor_template.js
+++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(h){var i=h.DOM,g=h.dom.Event,c=h.extend,f=h.each,a=h.util.Cookie,e,d=h.explode;function b(m,k){var q,p=m.dom,n="",o,l;previewStyles=m.settings.preview_styles;if(previewStyles===false){return""}if(!previewStyles){previewStyles="font-family font-size font-weight text-decoration text-transform color background-color"}function j(r){return r.replace(/%(\w+)/g,"")}name=k.block||k.inline||"span";q=p.create(name);f(k.styles,function(s,r){s=j(s);if(s){p.setStyle(q,r,s)}});f(k.attributes,function(s,r){s=j(s);if(s){p.setAttrib(q,r,s)}});f(k.classes,function(r){r=j(r);if(!p.hasClass(q,r)){p.addClass(q,r)}});p.setStyles(q,{position:"absolute",left:-65535});m.getBody().appendChild(q);o=p.getStyle(m.getBody(),"fontSize",true);o=/px$/.test(o)?parseInt(o,10):0;f(previewStyles.split(" "),function(r){var s=p.getStyle(q,r,true);if(r=="background-color"&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(s)){s=p.getStyle(m.getBody(),r,true);if(p.toHex(s).toLowerCase()=="#ffffff"){return}}if(r=="font-size"){if(/em|%$/.test(s)){if(o===0){return}s=parseFloat(s,10)/(/%$/.test(s)?100:1);s=(s*o)+"px"}}n+=r+":"+s+";"});p.remove(q);return n}h.ThemeManager.requireLangPack("advanced");h.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(k,l){var m=this,n,j,p;m.editor=k;m.url=l;m.onResolveName=new h.util.Dispatcher(this);k.forcedHighContrastMode=k.settings.detect_highcontrast&&m._isHighContrast();k.settings.skin=k.forcedHighContrastMode?"highcontrast":k.settings.skin;m.settings=n=c({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:k.settings.readonly},k.settings);if(!n.font_size_style_values){n.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(h.is(n.theme_advanced_font_sizes,"string")){n.font_size_style_values=h.explode(n.font_size_style_values);n.font_size_classes=h.explode(n.font_size_classes||"");p={};k.settings.theme_advanced_font_sizes=n.theme_advanced_font_sizes;f(k.getParam("theme_advanced_font_sizes","","hash"),function(r,q){var o;if(q==r&&r>=1&&r<=7){q=r+" ("+m.sizes[r-1]+"pt)";o=n.font_size_classes[r-1];r=n.font_size_style_values[r-1]||(m.sizes[r-1]+"pt")}if(/^\s*\./.test(r)){o=r.replace(/\./g,"")}p[q]=o?{"class":o}:{fontSize:r}});n.theme_advanced_font_sizes=p}if((j=n.theme_advanced_path_location)&&j!="none"){n.theme_advanced_statusbar_location=n.theme_advanced_path_location}if(n.theme_advanced_statusbar_location=="none"){n.theme_advanced_statusbar_location=0}if(k.settings.content_css!==false){k.contentCSS.push(k.baseURI.toAbsolute(l+"/skins/"+k.settings.skin+"/content.css"))}k.onInit.add(function(){if(!k.settings.readonly){k.onNodeChange.add(m._nodeChanged,m);k.onKeyUp.add(m._updateUndoStatus,m);k.onMouseUp.add(m._updateUndoStatus,m);k.dom.bind(k.dom.getRoot(),"dragend",function(){m._updateUndoStatus(k)})}});k.onSetProgressState.add(function(r,o,s){var t,u=r.id,q;if(o){m.progressTimer=setTimeout(function(){t=r.getContainer();t=t.insertBefore(i.create("DIV",{style:"position:relative"}),t.firstChild);q=i.get(r.id+"_tbl");i.add(t,"div",{id:u+"_blocker","class":"mceBlocker",style:{width:q.clientWidth+2,height:q.clientHeight+2}});i.add(t,"div",{id:u+"_progress","class":"mceProgress",style:{left:q.clientWidth/2,top:q.clientHeight/2}})},s||0)}else{i.remove(u+"_blocker");i.remove(u+"_progress");clearTimeout(m.progressTimer)}});i.loadCSS(n.editor_css?k.documentBaseURI.toAbsolute(n.editor_css):l+"/skins/"+k.settings.skin+"/ui.css");if(n.skin_variant){i.loadCSS(l+"/skins/"+k.settings.skin+"/ui_"+n.skin_variant+".css")}},_isHighContrast:function(){var j,k=i.add(i.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});j=(i.getStyle(k,"background-color",true)+"").toLowerCase().replace(/ /g,"");i.remove(k);return j!="rgb(171,239,86)"&&j!="#abef56"},createControl:function(m,j){var k,l;if(l=j.createControl(m)){return l}switch(m){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((k=this.controls[m])){return j.createButton(m,{title:"advanced."+k[0],cmd:k[1],ui:k[2],value:k[3]})}},execCommand:function(l,k,m){var j=this["_"+l];if(j){j.call(this,k,m);return true}return false},_importClasses:function(l){var j=this.editor,k=j.controlManager.get("styleselect");if(k.getLength()==0){f(j.dom.getClasses(),function(q,m){var p="style_"+m,n;n={inline:"span",attributes:{"class":q["class"]},selector:"*"};j.formatter.register(p,n);k.add(q["class"],p,{style:function(){return b(j,n)}})})}},_createStyleSelect:function(o){var l=this,j=l.editor,k=j.controlManager,m;m=k.createListBox("styleselect",{title:"advanced.style_select",onselect:function(q){var r,n=[],p;f(m.items,function(s){n.push(s.value)});j.focus();j.undoManager.add();r=j.formatter.matchAll(n);h.each(r,function(s){if(!q||s==q){if(s){j.formatter.remove(s)}p=true}});if(!p){j.formatter.apply(q)}j.undoManager.add();j.nodeChanged();return false}});j.onPreInit.add(function(){var p=0,n=j.getParam("style_formats");if(n){f(n,function(q){var r,s=0;f(q,function(){s++});if(s>1){r=q.name=q.name||"style_"+(p++);j.formatter.register(r,q);m.add(q.title,r,{style:function(){return b(j,q)}})}else{m.add(q.title)}})}else{f(j.getParam("theme_advanced_styles","","hash"),function(t,s){var r,q;if(t){r="style_"+(p++);q={inline:"span",classes:t,selector:"*"};j.formatter.register(r,q);m.add(l.editor.translate(s),r,{style:function(){return b(j,q)}})}})}});if(m.getLength()==0){m.onPostRender.add(function(p,q){if(!m.NativeListBox){g.add(q.id+"_text","focus",l._importClasses,l);g.add(q.id+"_text","mousedown",l._importClasses,l);g.add(q.id+"_open","focus",l._importClasses,l);g.add(q.id+"_open","mousedown",l._importClasses,l)}else{g.add(q.id,"focus",l._importClasses,l)}})}return m},_createFontSelect:function(){var l,k=this,j=k.editor;l=j.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(m){var n=l.items[l.selectedIndex];if(!m&&n){j.execCommand("FontName",false,n.value);return}j.execCommand("FontName",false,m);l.select(function(o){return m==o});if(n&&n.value==m){l.select(null)}return false}});if(l){f(j.getParam("theme_advanced_fonts",k.settings.theme_advanced_fonts,"hash"),function(n,m){l.add(j.translate(m),n,{style:n.indexOf("dings")==-1?"font-family:"+n:""})})}return l},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(o){var p=n.items[n.selectedIndex];if(!o&&p){p=p.value;if(p["class"]){k.formatter.toggle("fontsize_class",{value:p["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,p.fontSize)}return}if(o["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}n.select(function(q){return o==q});if(p&&(p.value.fontSize==o.fontSize||p.value["class"]&&p.value["class"]==o["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(p,o){var q=p.fontSize;if(q>=1&&q<=7){q=m.sizes[parseInt(q)-1]+"pt"}n.add(o,p,{style:"font-size:"+q,"class":"mceFontSize"+(l++)+(" "+(p["class"]||""))})})}return n},_createBlockFormats:function(){var l,j={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},k=this;l=k.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(m){k.editor.execCommand("FormatBlock",false,m);return false}});if(l){f(k.editor.getParam("theme_advanced_blockformats",k.settings.theme_advanced_blockformats,"hash"),function(n,m){l.add(k.editor.translate(m!=n?m:j[n]),n,{"class":"mce_formatPreview mce_"+n,style:function(){return b(k.editor,{block:n})}})})}return l},_createForeColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_text_colors){m.colors=j}if(l.theme_advanced_default_foreground_color){m.default_color=l.theme_advanced_default_foreground_color}m.title="advanced.forecolor_desc";m.cmd="ForeColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("forecolor",m);return n},_createBackColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_background_colors){m.colors=j}if(l.theme_advanced_default_background_color){m.default_color=l.theme_advanced_default_background_color}m.title="advanced.backcolor_desc";m.cmd="HiliteColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("backcolor",m);return n},renderUI:function(l){var q,m,r,w=this,u=w.editor,x=w.settings,v,k,j;if(u.settings){u.settings.aria_label=x.aria_label+u.getLang("advanced.help_shortcut")}q=k=i.create("span",{role:"application","aria-labelledby":u.id+"_voice",id:u.id+"_parent","class":"mceEditor "+u.settings.skin+"Skin"+(x.skin_variant?" "+u.settings.skin+"Skin"+w._ufirst(x.skin_variant):"")+(u.settings.directionality=="rtl"?" mceRtl":"")});i.add(q,"span",{"class":"mceVoiceLabel",style:"display:none;",id:u.id+"_voice"},x.aria_label);if(!i.boxModel){q=i.add(q,"div",{"class":"mceOldBoxModel"})}q=v=i.add(q,"table",{role:"presentation",id:u.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});q=r=i.add(q,"tbody");switch((x.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":m=w._rowLayout(x,r,l);break;case"customlayout":m=u.execCallback("theme_advanced_custom_layout",x,r,l,k);break;default:m=w._simpleLayout(x,r,l,k)}q=l.targetNode;j=v.rows;i.addClass(j[0],"mceFirst");i.addClass(j[j.length-1],"mceLast");f(i.select("tr",r),function(o){i.addClass(o.firstChild,"mceFirst");i.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(i.get(x.theme_advanced_toolbar_container)){i.get(x.theme_advanced_toolbar_container).appendChild(k)}else{i.insertAfter(k,q)}g.add(u.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){w._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return false}});if(!u.getParam("accessibility_focus")){g.add(i.add(k,"a",{href:"#"},""),"focus",function(){tinyMCE.get(u.id).focus()})}if(x.theme_advanced_toolbar_location=="external"){l.deltaHeight=0}w.deltaHeight=l.deltaHeight;l.targetNode=null;u.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(h.isWebKit){window.focus()}w.toolbarGroup.focus();return g.cancel(n)}else{if(n.keyCode===o){i.get(p.id+"_path_row").focus();return g.cancel(n)}}}});u.addShortcut("alt+0","","mceShortcuts",w);return{iframeContainer:m,editorContainer:u.id+"_parent",sizeContainer:v,deltaHeight:l.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:h.majorVersion+"."+h.minorVersion}},resizeBy:function(j,k){var l=i.get(this.editor.id+"_ifr");this.resizeTo(l.clientWidth+j,l.clientHeight+k)},resizeTo:function(j,n,l){var k=this.editor,m=this.settings,o=i.get(k.id+"_tbl"),p=i.get(k.id+"_ifr");j=Math.max(m.theme_advanced_resizing_min_width||100,j);n=Math.max(m.theme_advanced_resizing_min_height||100,n);j=Math.min(m.theme_advanced_resizing_max_width||65535,j);n=Math.min(m.theme_advanced_resizing_max_height||65535,n);i.setStyle(o,"height","");i.setStyle(p,"height",n);if(m.theme_advanced_resize_horizontal){i.setStyle(o,"width","");i.setStyle(p,"width",j);if(j
+ *- ...
+ * - ...
+ * ...
+ *
+ * + * @return {object} section list configuration */ -M.course.format.get_section_selector = function(Y) { - return 'li.section'; +M.course.format.get_config = function() { + return { + container_node : 'ul', + container_class : 'topics', + section_node : 'li', + section_class : 'section' + }; } /** @@ -25,13 +36,32 @@ M.course.format.get_section_selector = function(Y) { M.course.format.swap_sections = function(Y, node1, node2) { var CSS = { COURSECONTENT : 'course-content', - LEFT : 'left', SECTIONADDMENUS : 'section_add_menus' }; var sectionlist = Y.Node.all('.'+CSS.COURSECONTENT+' '+M.course.format.get_section_selector(Y)); - // Swap left block - sectionlist.item(node1).one('.'+CSS.LEFT).swap(sectionlist.item(node2).one('.'+CSS.LEFT)); // Swap menus sectionlist.item(node1).one('.'+CSS.SECTIONADDMENUS).swap(sectionlist.item(node2).one('.'+CSS.SECTIONADDMENUS)); } + +/** + * Process sections after ajax response + * + * @param {YUI} Y YUI3 instance + * @param {array} response ajax response + * @param {string} sectionfrom first affected section + * @param {string} sectionto last affected section + * @return void + */ +M.course.format.process_sections = function(Y, sectionlist, response, sectionfrom, sectionto) { + var CSS = { + SECTIONNAME : 'sectionname' + }; + + if (response.action == 'move') { + // update titles in all affected sections + for (var i = sectionfrom; i <= sectionto; i++) { + sectionlist.item(i).one('.'+CSS.SECTIONNAME).setContent(response.sectiontitles[i]); + } + } +} diff --git a/course/format/topics/lib.php b/course/format/topics/lib.php index 710abaf318e..e8632fcab8b 100644 --- a/course/format/topics/lib.php +++ b/course/format/topics/lib.php @@ -80,3 +80,24 @@ function callback_topics_ajax_support() { $ajaxsupport->testedbrowsers = array('MSIE' => 6.0, 'Gecko' => 20061111, 'Safari' => 531, 'Chrome' => 6.0); return $ajaxsupport; } + +/** + * Callback function to do some action after section move + * + * @param stdClass $course The course entry from DB + * @return array This will be passed in ajax respose. + */ +function callback_topics_ajax_section_move($course) { + global $COURSE, $PAGE; + + $titles = array(); + rebuild_course_cache($course->id); + $modinfo = get_fast_modinfo($COURSE); + $renderer = $PAGE->get_renderer('format_topics'); + if ($renderer && ($sections = $modinfo->get_section_info_all())) { + foreach ($sections as $number => $section) { + $titles[$number] = $renderer->section_title($section, $course); + } + } + return array('sectiontitles' => $titles, 'action' => 'move'); +} diff --git a/course/format/topics/renderer.php b/course/format/topics/renderer.php index 7050488c5b1..5ef126f5987 100644 --- a/course/format/topics/renderer.php +++ b/course/format/topics/renderer.php @@ -102,23 +102,4 @@ class format_topics_renderer extends format_section_renderer_base { return array_merge($controls, parent::section_edit_controls($course, $section, $onsectionpage)); } - - /** - * Generate the content to displayed on the left part of a section - * - * before course modules are included - * @param stdClass $section The course_section entry from DB - * @param stdClass $course The course entry from DB - * @param bool $onsectionpage true if being printed on a section page - * @return string HTML to output. - */ - protected function section_left_content($section, $course, $onsectionpage) { - $o = parent::section_left_content($section, $course, $onsectionpage); - - if ($section->section > 0) { - $o.= $section->section; - } - - return $o; - } } diff --git a/course/format/weeks/format.js b/course/format/weeks/format.js index 78c20631b70..f410e07d357 100644 --- a/course/format/weeks/format.js +++ b/course/format/weeks/format.js @@ -1,17 +1,28 @@ -// Javascript functions for course format +// Javascript functions for Weeks course format M.course = M.course || {}; M.course.format = M.course.format || {}; /** - * Get section list for this format + * Get sections config for this format * - * @param {YUI} Y YUI3 instance - * @return {string} section list selector + * The section structure is: + *+ *- ...
+ * - ...
+ * ...
+ *
+ * + * @return {object} section list configuration */ -M.course.format.get_section_selector = function(Y) { - return 'li.section'; +M.course.format.get_config = function() { + return { + container_node : 'ul', + container_class : 'weeks', + section_node : 'li', + section_class : 'section' + }; } /** @@ -25,16 +36,32 @@ M.course.format.get_section_selector = function(Y) { M.course.format.swap_sections = function(Y, node1, node2) { var CSS = { COURSECONTENT : 'course-content', - LEFT : 'left', SECTIONADDMENUS : 'section_add_menus', - WEEKDATES: 'weekdates' }; var sectionlist = Y.Node.all('.'+CSS.COURSECONTENT+' '+M.course.format.get_section_selector(Y)); - // Swap left block - sectionlist.item(node1).one('.'+CSS.LEFT).swap(sectionlist.item(node2).one('.'+CSS.LEFT)); // Swap menus sectionlist.item(node1).one('.'+CSS.SECTIONADDMENUS).swap(sectionlist.item(node2).one('.'+CSS.SECTIONADDMENUS)); - // Swap week dates - sectionlist.item(node1).one('.'+CSS.WEEKDATES).swap(sectionlist.item(node2).one('.'+CSS.WEEKDATES)); +} + +/** + * Process sections after ajax response + * + * @param {YUI} Y YUI3 instance + * @param {array} response ajax response + * @param {string} sectionfrom first affected section + * @param {string} sectionto last affected section + * @return void + */ +M.course.format.process_sections = function(Y, sectionlist, response, sectionfrom, sectionto) { + var CSS = { + SECTIONNAME : 'sectionname' + }; + + if (response.action == 'move') { + // update titles in all affected sections + for (var i = sectionfrom; i <= sectionto; i++) { + sectionlist.item(i).one('.'+CSS.SECTIONNAME).setContent(response.sectiontitles[i]); + } + } } diff --git a/course/format/weeks/lib.php b/course/format/weeks/lib.php index 9201c9e2d6f..a1e1ea9cd16 100644 --- a/course/format/weeks/lib.php +++ b/course/format/weeks/lib.php @@ -67,25 +67,20 @@ function callback_weeks_definition() { function callback_weeks_get_section_name($course, $section) { // We can't add a node without text if (!empty($section->name)) { - // Return the name the user set - return format_string($section->name, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + // Return the name the user set. + return format_string($section->name, true, array('context' => context_course::instance($course->id))); } else if ($section->section == 0) { - // Return the section0name + // Return the general section. return get_string('section0name', 'format_weeks'); } else { - // Got to work out the date of the week so that we can show it - $sections = get_all_sections($course->id); - $weekdate = $course->startdate+7200; - foreach ($sections as $sec) { - if ($sec->id == $section->id) { - break; - } else if ($sec->section != 0) { - $weekdate += 604800; - } - } - $strftimedateshort = ' '.get_string('strftimedateshort'); - $weekday = userdate($weekdate, $strftimedateshort); - $endweekday = userdate($weekdate+518400, $strftimedateshort); + $dates = format_weeks_get_section_dates($section, $course); + + // We subtract 24 hours for display purposes. + $dates->end = ($dates->end - 86400); + + $dateformat = ' '.get_string('strftimedateshort'); + $weekday = userdate($dates->start, $dateformat); + $endweekday = userdate($dates->end, $dateformat); return $weekday.' - '.$endweekday; } } @@ -102,3 +97,44 @@ function callback_weeks_ajax_support() { $ajaxsupport->testedbrowsers = array('MSIE' => 6.0, 'Gecko' => 20061111, 'Safari' => 531, 'Chrome' => 6.0); return $ajaxsupport; } + +/** + * Return the start and end date of the passed section + * + * @param stdClass $section The course_section entry from the DB + * @param stdClass $course The course entry from DB + * @return stdClass property start for startdate, property end for enddate + */ +function format_weeks_get_section_dates($section, $course) { + $oneweekseconds = 604800; + // Hack alert. We add 2 hours to avoid possible DST problems. (e.g. we go into daylight + // savings and the date changes. + $startdate = $course->startdate + 7200; + + $dates = new stdClass(); + $dates->start = $startdate + ($oneweekseconds * ($section->section - 1)); + $dates->end = $dates->start + $oneweekseconds; + + return $dates; +} + +/** + * Callback function to do some action after section move + * + * @param stdClass $course The course entry from DB + * @return array This will be passed in ajax respose. + */ +function callback_weeks_ajax_section_move($course) { + global $COURSE, $PAGE; + + $titles = array(); + rebuild_course_cache($course->id); + $modinfo = get_fast_modinfo($COURSE); + $renderer = $PAGE->get_renderer('format_weeks'); + if ($renderer && ($sections = $modinfo->get_section_info_all())) { + foreach ($sections as $number => $section) { + $titles[$number] = $renderer->section_title($section, $course); + } + } + return array('sectiontitles' => $titles, 'action' => 'move'); +} diff --git a/course/format/weeks/renderer.php b/course/format/weeks/renderer.php index 33d640281b6..e87936ccbf5 100644 --- a/course/format/weeks/renderer.php +++ b/course/format/weeks/renderer.php @@ -26,6 +26,7 @@ defined('MOODLE_INTERNAL') || die(); require_once($CFG->dirroot.'/course/format/renderer.php'); +require_once($CFG->dirroot.'/course/format/weeks/lib.php'); /** @@ -58,4 +59,22 @@ class format_weeks_renderer extends format_section_renderer_base { protected function page_title() { return get_string('weeklyoutline'); } + + /** + * Is the section passed in the current section? + * + * @param stdClass $section The course_section entry from the DB + * @param stdClass $course The course entry from DB + * @return bool true if the section is current + */ + protected function is_section_current($section, $course) { + if ($section->section < 1) { + return false; + } + + $timenow = time(); + $dates = format_weeks_get_section_dates($section, $course); + + return (($timenow >= $dates->start) && ($timenow < $dates->end)); + } } diff --git a/course/lib.php b/course/lib.php index 9a64052c153..a5566d6a6bc 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1518,13 +1518,6 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, //Accessibility: for files get description via icon, this is very ugly hack! $altname = ''; $altname = $mod->modfullname; - if (!empty($customicon)) { - $archetype = plugin_supports('mod', $mod->modname, FEATURE_MOD_ARCHETYPE, MOD_ARCHETYPE_OTHER); - if ($archetype == MOD_ARCHETYPE_RESOURCE) { - $mimetype = mimeinfo_from_icon('type', $customicon); - $altname = get_mimetype_description($mimetype); - } - } // Avoid unnecessary duplication: if e.g. a forum name already // includes the word forum (or Forum, etc) then it is unhelpful // to include that in the accessible description that is added. @@ -1735,7 +1728,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // see the activity itself, or for staff) if (!$mod->uservisible) { echo '$activity->name
"; + if (!empty($activity->name)) { + echo html_writer::tag('h2', $activity->name); + } $inbox = true; } else if ($activity->type == 'activity') { @@ -230,16 +232,17 @@ if (!empty($activities)) { $cm = $modinfo->cms[$activity->cmid]; if ($cm->visible) { - $linkformat = ''; + $class = ''; } else { - $linkformat = 'class="dimmed"'; + $class = 'dimmed'; } $name = format_string($cm->name); $modfullname = $modnames[$cm->modname]; - $image = "$image $modfullname". - " wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name
"; + $image = $OUTPUT->pix_icon('icon', $modfullname, $cm->modname, array('class' => 'icon smallicon')); + $link = html_writer::link(new moodle_url("/mod/$cm->modname/view.php", + array("id" => $cm->id)), $name, array('class' => $class)); + echo html_writer::tag('h3', "$image $modfullname $link"); } } else { @@ -269,7 +272,7 @@ if (!empty($activities)) { } else { - echo '' . get_string('norecentactivity') . '
'; + echo html_writer::tag('h3', get_string('norecentactivity'), array('class' => 'mdl-align')); } diff --git a/course/rest.php b/course/rest.php index 5152563ad92..6efd228db65 100644 --- a/course/rest.php +++ b/course/rest.php @@ -89,6 +89,15 @@ switch($requestmethod) { case 'move': move_section_to($course, $id, $value); + // See if format wants to do something about it + $libfile = $CFG->dirroot.'/course/format/'.$course->format.'/lib.php'; + $functionname = 'callback_'.$course->format.'_ajax_section_move'; + if (!function_exists($functionname) && file_exists($libfile)) { + require_once $libfile; + } + if (function_exists($functionname)) { + echo json_encode($functionname($course)); + } break; } rebuild_course_cache($course->id); diff --git a/course/view.php b/course/view.php index a7b1784b1c5..de3798102d2 100644 --- a/course/view.php +++ b/course/view.php @@ -88,8 +88,18 @@ require_once($CFG->dirroot.'/calendar/lib.php'); /// This is after login because it needs $USER - //TODO: danp do we need different urls? - add_to_log($course->id, 'course', 'view', "view.php?id=$course->id", "$course->id"); + $logparam = 'id='. $course->id; + $loglabel = 'view'; + $infoid = $course->id; + if(!empty($section)) { + $logparam .= '§ion='. $section; + $loglabel = 'view section'; + $sectionparams = array('course' => $course->id, 'section' => $section); + if ($coursesections = $DB->get_record('course_sections', $sectionparams, 'id', MUST_EXIST)) { + $infoid = $coursesections->id; + } + } + add_to_log($course->id, 'course', $loglabel, "view.php?". $logparam, $infoid); $course->format = clean_param($course->format, PARAM_ALPHA); if (!file_exists($CFG->dirroot.'/course/format/'.$course->format.'/format.php')) { diff --git a/course/yui/coursebase/coursebase.js b/course/yui/coursebase/coursebase.js index 713ad709d95..b02c36263c0 100644 --- a/course/yui/coursebase/coursebase.js +++ b/course/yui/coursebase/coursebase.js @@ -52,6 +52,171 @@ YUI.add('moodle-course-coursebase', function(Y) { // Ensure that M.course exists and that coursebase is initialised correctly M.course = M.course || {}; M.course.coursebase = M.course.coursebase || new COURSEBASE(); + + // Abstract functions that needs to be defined per format (course/format/somename/format.js) + M.course.format = M.course.format || {} + + /** + * Swap section (should be defined in format.js if requred) + * + * @param {YUI} Y YUI3 instance + * @param {string} node1 node to swap to + * @param {string} node2 node to swap with + * @return {NodeList} section list + */ + M.course.format.swap_sections = M.course.format.swap_sections || function(Y, node1, node2) { + return null; + } + + /** + * Process sections after ajax response (should be defined in format.js) + * If some response is expected, we pass it over to format, as it knows better + * hot to process it. + * + * @param {YUI} Y YUI3 instance + * @param {NodeList} list of sections + * @param {array} response ajax response + * @param {string} sectionfrom first affected section + * @param {string} sectionto last affected section + * @return void + */ + M.course.format.process_sections = M.course.format.process_sections || function(Y, sectionlist, response, sectionfrom, sectionto) { + return null; + } + + /** + * Get sections config for this format, for examples see function definition + * in the formats. + * + * @return {object} section list configuration + */ + M.course.format.get_config = M.course.format.get_config || function() { + return { + container_node : null, // compulsory + container_class : null, // compulsory + section_wrapper_node : null, // optional + section_wrapper_class : null, // optional + section_node : null, // compulsory + section_class : null // compulsory + } + } + + /** + * Get section list for this format (usually items inside container_node.container_class selector) + * + * @param {YUI} Y YUI3 instance + * @return {string} section selector + */ + M.course.format.get_section_selector = M.course.format.get_section_selector || function(Y) { + var config = M.course.format.get_config(); + if (config.section_node && config.section_class) { + return config.section_node + '.' + config.section_class; + } + console.log('section_node and section_class are not defined in M.course.format.get_config'); + return null; + } + + /** + * Get section wraper for this format (only used in case when each + * container_node.container_class node is wrapped in some other element). + * + * @param {YUI} Y YUI3 instance + * @return {string} section wrapper selector or M.course.format.get_section_selector + * if section_wrapper_node and section_wrapper_class are not defined in the format config. + */ + M.course.format.get_section_wrapper = M.course.format.get_section_wrapper || function(Y) { + var config = M.course.format.get_config(); + if (config.section_wrapper_node && config.section_wrapper_class) { + return config.section_wrapper_node + '.' + config.section_wrapper_class; + } + return M.course.format.get_section_selector(Y); + } + + /** + * Get the tag of container node + * + * @return {string} tag of container node. + */ + M.course.format.get_containernode = M.course.format.get_containernode || function() { + var config = M.course.format.get_config(); + if (config.container_node) { + return config.container_node; + } else { + console.log('container_node is not defined in M.course.format.get_config'); + } + } + + /** + * Get the class of container node + * + * @return {string} class of the container node. + */ + M.course.format.get_containerclass = M.course.format.get_containerclass || function() { + var config = M.course.format.get_config(); + if (config.container_class) { + return config.container_class; + } else { + console.log('container_class is not defined in M.course.format.get_config'); + } + } + + /** + * Get the tag of draggable node (section wrapper if exists, otherwise section) + * + * @return {string} tag of the draggable node. + */ + M.course.format.get_sectionwrappernode = M.course.format.get_sectionwrappernode || function() { + var config = M.course.format.get_config(); + if (config.section_wrapper_node) { + return config.section_wrapper_node; + } else { + return config.section_node; + } + } + + /** + * Get the class of draggable node (section wrapper if exists, otherwise section) + * + * @return {string} class of the draggable node. + */ + M.course.format.get_sectionwrapperclass = M.course.format.get_sectionwrapperclass || function() { + var config = M.course.format.get_config(); + if (config.section_wrapper_class) { + return config.section_wrapper_class; + } else { + return config.section_class; + } + } + + /** + * Get the tag of section node + * + * @return {string} tag of section node. + */ + M.course.format.get_sectionnode = M.course.format.get_sectionnode || function() { + var config = M.course.format.get_config(); + if (config.section_node) { + return config.section_node; + } else { + console.log('section_node is not defined in M.course.format.get_config'); + } + } + + /** + * Get the class of section node + * + * @return {string} class of the section node. + */ + M.course.format.get_sectionclass = M.course.format.get_sectionclass || function() { + var config = M.course.format.get_config(); + if (config.section_class) { + return config.section_class; + } else { + console.log('section_class is not defined in M.course.format.get_config'); + } + + } + }, '@VERSION@', { requires : ['base', 'node'] diff --git a/course/yui/dragdrop/dragdrop.js b/course/yui/dragdrop/dragdrop.js index c3ed979443b..080cace768d 100644 --- a/course/yui/dragdrop/dragdrop.js +++ b/course/yui/dragdrop/dragdrop.js @@ -17,9 +17,7 @@ YUI.add('moodle-course-dragdrop', function(Y) { SECTION : 'section', SECTIONADDMENUS : 'section_add_menus', SECTIONHANDLE : 'section-handle', - SUMMARY : 'summary', - TOPICS : 'topics', - WEEKDATES: 'weekdates' + SUMMARY : 'summary' }; var DRAGSECTION = function() { @@ -31,16 +29,17 @@ YUI.add('moodle-course-dragdrop', function(Y) { initializer : function(params) { // Set group for parent class this.groups = ['section']; - this.samenodeclass = CSS.SECTION; - this.parentnodeclass = CSS.TOPICS; + this.samenodeclass = M.course.format.get_sectionwrapperclass(); + this.parentnodeclass = M.course.format.get_containerclass(); // Check if we are in single section mode if (Y.Node.one('.'+CSS.JUMPMENU)) { return false; } // Initialise sections dragging - if (M.course.format && M.course.format.get_section_selector && typeof(M.course.format.get_section_selector) == 'function') { - this.sectionlistselector = '.'+CSS.COURSECONTENT+' '+M.course.format.get_section_selector(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); } }, @@ -109,17 +108,24 @@ YUI.add('moodle-course-dragdrop', function(Y) { // Get our drag object var drag = e.target; // Creat a dummy structure of the outer elemnents for clean styles application - var ul = Y.Node.create(''); - ul.addClass(CSS.TOPICS); - var li = Y.Node.create(''); - li.addClass(CSS.SECTION); - li.setStyle('margin', 0); - li.setContent(drag.get('node').get('innerHTML')); - ul.appendChild(li); - drag.get('dragNode').setContent(ul); + var containernode = Y.Node.create('<'+M.course.format.get_containernode()+'>'); + containernode.addClass(M.course.format.get_containerclass()); + var sectionnode = Y.Node.create('<'+ M.course.format.get_sectionwrappernode()+'>'); + sectionnode.addClass( M.course.format.get_sectionwrapperclass()); + sectionnode.setStyle('margin', 0); + sectionnode.setContent(drag.get('node').get('innerHTML')); + containernode.appendChild(sectionnode); + drag.get('dragNode').setContent(containernode); drag.get('dragNode').addClass(CSS.COURSECONTENT); }, + drag_dropmiss : function(e) { + // Missed the target, but we assume the user intended to drop it + // on the last last ghost node location, e.drag and e.drop should be + // prepared by global_drag_dropmiss parent so simulate drop_hit(e). + this.drop_hit(e); + }, + drop_hit : function(e) { var drag = e.drag; // Get a reference to our drag node @@ -173,9 +179,16 @@ YUI.add('moodle-course-dragdrop', function(Y) { lightbox.show(); }, success: function(tid, response) { - window.setTimeout(function(e) { - lightbox.hide(); - }, 250); + // Update section titles, we can't simply swap them as + // they might have custom title + try { + var responsetext = Y.JSON.parse(response.responseText); + if (responsetext.error) { + new M.core.ajaxException(responsetext); + } + M.course.format.process_sections(Y, sectionlist, responsetext, loopstart, loopend); + } catch (e) {} + // Classic bubble sort algorithm is applied to the section // nodes between original drag node location and the new one. do { @@ -186,16 +199,19 @@ YUI.add('moodle-course-dragdrop', function(Y) { var sectionid = sectionlist.item(i-1).get('id'); sectionlist.item(i-1).set('id', sectionlist.item(i).get('id')); sectionlist.item(i).set('id', sectionid); - // See what format needs to be swapped - if (M.course.format && M.course.format.swap_sections && typeof(M.course.format.swap_sections) == 'function') { - M.course.format.swap_sections(Y, i-1, i); - } + // See what format needs to swap + M.course.format.swap_sections(Y, i-1, i); // Update flag swapped = true; } } loopend = loopend - 1; } while (swapped); + + // Finally, hide the lightbox + window.setTimeout(function(e) { + lightbox.hide(); + }, 250); }, failure: function(tid, response) { this.ajax_failure(response); @@ -232,8 +248,9 @@ YUI.add('moodle-course-dragdrop', function(Y) { this.parentnodeclass = CSS.SECTION; // Go through all sections - if (M.course.format && M.course.format.get_section_selector && typeof(M.course.format.get_section_selector) == 'function') { - var sectionlistselector = '.'+CSS.COURSECONTENT+' '+M.course.format.get_section_selector(Y); + var sectionlistselector = M.course.format.get_section_selector(Y); + if (sectionlistselector) { + sectionlistselector = '.'+CSS.COURSECONTENT+' '+sectionlistselector; this.setup_for_section(sectionlistselector); M.course.coursebase.register_module(this); M.course.dragres = this; @@ -263,7 +280,7 @@ YUI.add('moodle-course-dragdrop', function(Y) { padding: '20 0 20 0' }); // Go through each li element and make them draggable - this.setup_for_resource('li#'+sectionnode.get('id')+' li.'+CSS.ACTIVITY); + this.setup_for_resource('#'+sectionnode.get('id')+' li.'+CSS.ACTIVITY); }, this); }, /** @@ -311,14 +328,19 @@ YUI.add('moodle-course-dragdrop', function(Y) { drag.get('dragNode').all('img.iconsmall').setStyle('vertical-align', 'baseline'); }, + drag_dropmiss : function(e) { + // Missed the target, but we assume the user intended to drop it + // on the last last ghost node location, e.drag and e.drop should be + // prepared by global_drag_dropmiss parent so simulate drop_hit(e). + this.drop_hit(e); + }, + drop_hit : function(e) { var drag = e.drag; // Get a reference to our drag node var dragnode = drag.get('node'); var dropnode = e.drop.get('node'); - var sectionselector = M.course.format.get_section_selector(Y); - // Add spinner if it not there var spinner = M.util.add_spinner(Y, dragnode.one(CSS.COMMANDSPAN)); @@ -336,7 +358,7 @@ YUI.add('moodle-course-dragdrop', function(Y) { params['class'] = 'resource'; params.field = 'move'; params.id = Number(this.get_resource_id(dragnode)); - params.sectionId = this.get_section_id(dropnode.ancestor(sectionselector)); + params.sectionId = this.get_section_id(dropnode.ancestor(M.course.format.get_section_wrapper(Y), true)); if (dragnode.next()) { params.beforeId = Number(this.get_resource_id(dragnode.next())); diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js index 6dfcce0bd7d..024785ebf4b 100644 --- a/course/yui/toolboxes/toolboxes.js +++ b/course/yui/toolboxes/toolboxes.js @@ -28,7 +28,7 @@ YUI.add('moodle-course-toolboxes', function(Y) { MOVELEFTCLASS : 'editing_moveleft', MOVERIGHT : 'a.editing_moveright', PAGECONTENT : 'div#page-content', - RIGHTDIV : 'div.right', + RIGHTSIDE : '.right', SECTIONHIDDENCLASS : 'hidden', SECTIONIDPREFIX : 'section-', SECTIONLI : 'li.section', @@ -384,7 +384,7 @@ YUI.add('moodle-course-toolboxes', function(Y) { e.preventDefault(); // Return early if the current section is hidden - var section = e.target.ancestor(CSS.SECTIONLI); + var section = e.target.ancestor(M.course.format.get_section_selector(Y)); if (section && section.hasClass(CSS.SECTIONHIDDENCLASS)) { return; } @@ -649,17 +649,17 @@ YUI.add('moodle-course-toolboxes', function(Y) { }, _setup_for_section : function(toolboxtarget) { // Section Highlighting - this.replace_button(toolboxtarget, CSS.RIGHTDIV + ' ' + CSS.HIGHLIGHT, this.toggle_highlight); + this.replace_button(toolboxtarget, CSS.RIGHTSIDE + ' ' + CSS.HIGHLIGHT, this.toggle_highlight); // Section Visibility - this.replace_button(toolboxtarget, CSS.RIGHTDIV + ' ' + CSS.SHOWHIDE, this.toggle_hide_section); + this.replace_button(toolboxtarget, CSS.RIGHTSIDE + ' ' + CSS.SHOWHIDE, this.toggle_hide_section); }, toggle_hide_section : function(e) { // Prevent the default button action e.preventDefault(); // Get the section we're working on - var section = e.target.ancestor(CSS.SECTIONLI); + var section = e.target.ancestor(M.course.format.get_section_selector(Y)); var button = e.target.ancestor('a', true); var hideicon = button.one('img'); @@ -691,7 +691,7 @@ YUI.add('moodle-course-toolboxes', function(Y) { var data = { 'class' : 'section', 'field' : 'visible', - 'id' : this.get_section_id(section), + 'id' : this.get_section_id(section.ancestor(M.course.format.get_section_wrapper(Y), true)), 'value' : value }; @@ -725,7 +725,7 @@ YUI.add('moodle-course-toolboxes', function(Y) { e.preventDefault(); // Get the section we're working on - var section = e.target.ancestor(CSS.SECTIONLI); + var section = e.target.ancestor(M.course.format.get_section_selector(Y)); var button = e.target.ancestor('a', true); var buttonicon = button.one('img'); @@ -736,22 +736,22 @@ YUI.add('moodle-course-toolboxes', function(Y) { // Set the current highlighted item text var old_string = M.util.get_string('markthistopic', 'moodle'); Y.one(CSS.PAGECONTENT) - .all(CSS.SECTIONLI + '.current ' + CSS.HIGHLIGHT) + .all(M.course.format.get_section_selector(Y) + '.current ' + CSS.HIGHLIGHT) .set('title', old_string); Y.one(CSS.PAGECONTENT) - .all(CSS.SECTIONLI + '.current ' + CSS.HIGHLIGHT + ' img') + .all(M.course.format.get_section_selector(Y) + '.current ' + CSS.HIGHLIGHT + ' img') .set('title', old_string) .set('alt', old_string) .set('src', M.util.image_url('i/marker')); // Remove the highlighting from all sections - var allsections = Y.one(CSS.PAGECONTENT).all(CSS.SECTIONLI) + var allsections = Y.one(CSS.PAGECONTENT).all(M.course.format.get_section_selector(Y)) .removeClass('current'); // Then add it if required to the selected section if (!togglestatus) { section.addClass('current'); - value = this.get_section_id(section); + value = this.get_section_id(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 baeceaf7af7..ede57069134 100644 --- a/draftfile.php +++ b/draftfile.php @@ -36,6 +36,7 @@ if (isguestuser()) { } $relativepath = get_file_argument(); +$preview = optional_param('preview', null, PARAM_ALPHANUM); // relative path must start with '/' if (!$relativepath) { @@ -84,4 +85,4 @@ 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 -send_stored_file($file, 0, false, true); // force download - security first! +send_stored_file($file, 0, false, true, array('preview' => $preview)); // force download - security first! diff --git a/enrol/externallib.php b/enrol/externallib.php index 57b6ac13efd..08438e18b77 100644 --- a/enrol/externallib.php +++ b/enrol/externallib.php @@ -207,7 +207,7 @@ class core_enrol_external extends external_api { $exceptionparam = new stdClass(); $exceptionparam->message = $e->getMessage(); $exceptionparam->courseid = $params['courseid']; - throw new moodle_exception(get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam)); + throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam); } if ($courseid == SITEID) { @@ -543,7 +543,7 @@ class moodle_enrol_external extends external_api { $exceptionparam = new stdClass(); $exceptionparam->message = $e->getMessage(); $exceptionparam->courseid = $params['courseid']; - throw new moodle_exception(get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam)); + throw new moodle_exception('errorcoursecontextnotvalid' , 'webservice', '', $exceptionparam); } if ($courseid == SITEID) { diff --git a/enrol/mnet/enrol.php b/enrol/mnet/enrol.php index 7a0a0af5a63..c09cd7e4601 100644 --- a/enrol/mnet/enrol.php +++ b/enrol/mnet/enrol.php @@ -145,6 +145,7 @@ class enrol_mnet_mnetservice_enrol { // users {@link http://tracker.moodle.org/browse/MDL-21327} $user = mnet_strip_user((object)$userdata, mnet_fields_to_import($client)); $user->mnethostid = $client->id; + $user->auth = 'mnet'; try { $user->id = $DB->insert_record('user', $user); } catch (Exception $e) { diff --git a/files/coursefilesedit_form.php b/files/coursefilesedit_form.php index e5498dcec18..fadd387413d 100644 --- a/files/coursefilesedit_form.php +++ b/files/coursefilesedit_form.php @@ -21,7 +21,7 @@ class coursefiles_edit_form extends moodleform { function definition() { $mform =& $this->_form; $contextid = $this->_customdata['contextid']; - $options = array('subdirs'=>1, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL); + $options = array('subdirs'=>1, 'maxfiles'=>-1, 'accepted_types'=>'*'); $mform->addElement('filemanager', 'files_filemanager', '', null, $options); $mform->addElement('hidden', 'contextid', $this->_customdata['contextid']); $this->set_data($this->_customdata['data']); diff --git a/files/filebrowser_ajax.php b/files/filebrowser_ajax.php index 2d651e95765..a8b638b5c54 100644 --- a/files/filebrowser_ajax.php +++ b/files/filebrowser_ajax.php @@ -70,10 +70,10 @@ switch ($action) { if ($child->is_directory()) { $fileitem['isdir'] = true; $fileitem['url'] = $url->out(false); - $fileitem['icon'] = $OUTPUT->pix_icon('f/folder', get_string('icon')); + $fileitem['icon'] = $OUTPUT->pix_icon(file_folder_icon(), get_string('icon')); } else { $fileitem['url'] = $child->get_url(); - $fileitem['icon'] = $OUTPUT->pix_icon('f/'.mimeinfo('icon', $child->get_visible_name()), get_string('icon')); + $fileitem['icon'] = $OUTPUT->pix_icon(file_file_icon($child), get_string('icon')); } $tree[] = $fileitem; } diff --git a/files/renderer.php b/files/renderer.php index 15971636267..3728a23443c 100644 --- a/files/renderer.php +++ b/files/renderer.php @@ -56,25 +56,31 @@ class core_files_renderer extends plugin_renderer_base { $html .= $this->output->box_start(); $table = new html_table(); - $table->head = array(get_string('filename', 'backup'), get_string('size'), get_string('modified')); - $table->align = array('left', 'right', 'right'); + $table->head = array(get_string('name'), get_string('lastmodified'), get_string('size', 'repository'), get_string('type', 'repository')); + $table->align = array('left', 'left', 'left', 'left'); $table->width = '100%'; $table->data = array(); foreach ($tree->tree as $file) { - if (!empty($file['isdir'])) { - $table->data[] = array( - html_writer::link($file['url'], $this->output->pix_icon('f/folder', 'icon') . ' ' . $file['filename']), - '', - $file['filedate'], - ); - } else { - $table->data[] = array( - html_writer::link($file['url'], $this->output->pix_icon('f/'.mimeinfo('icon', $file['filename']), get_string('icon')) . ' ' . $file['filename']), - $file['filesize'], - $file['filedate'], - ); + $filedate = $filesize = $filetype = ''; + if ($file['filedate']) { + $filedate = userdate($file['filedate'], get_string('strftimedatetimeshort', 'langconfig')); } + if (empty($file['isdir'])) { + if ($file['filesize']) { + $filesize = display_size($file['filesize']); + } + $fileicon = file_file_icon($file, 24); + $filetype = get_mimetype_description($file); + } else { + $fileicon = file_folder_icon(24); + } + $table->data[] = array( + html_writer::link($file['url'], $this->output->pix_icon($fileicon, get_string('icon')) . ' ' . $file['filename']), + $filedate, + $filesize, + $filetype + ); } $html .= html_writer::table($table); @@ -82,8 +88,818 @@ class core_files_renderer extends plugin_renderer_base { $html .= $this->output->box_end(); return $html; } -} + /** + * Prints the file manager and initializes all necessary libraries + * + *
+ * $fm = new form_filemanager($options); + * $output = get_renderer('core', 'files'); + * echo $output->render($fm); + *+ * + * @param form_filemanager $fm File manager to render + * @return string HTML fragment + */ + public function render_form_filemanager($fm) { + static $filemanagertemplateloaded; + $html = $this->fm_print_generallayout($fm); + $module = array( + 'name'=>'form_filemanager', + 'fullpath'=>'/lib/form/filemanager.js', + 'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'), + 'strings' => array( + array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'), + array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'), + array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'), + array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'), + array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'), + array('confirmrenamefile', 'repository') + ) + ); + if (empty($filemanagertemplateloaded)) { + $filemanagertemplateloaded = true; + $this->page->requires->js_init_call('M.form_filemanager.set_templates', + array($this->filemanager_js_templates()), true, $module); + } + $this->page->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module); + + // non javascript file manager + $html .= ''; + + + return $html; + } + + /** + * Returns html for displaying one file manager + * + * The main element in HTML must have id="filemanager-{$client_id}" and + * class="filemanager fm-loading"; + * After all necessary code on the page (both html and javascript) is loaded, + * the class fm-loading will be removed and added class fm-loaded; + * The main element (class=filemanager) will be assigned the following classes: + * 'fm-maxfiles' - when filemanager has maximum allowed number of files; + * 'fm-nofiles' - when filemanager has no files at all (although there might be folders); + * 'fm-noitems' - when current view (folder) has no items - neither files nor folders; + * 'fm-updating' - when current view is being updated (usually means that loading icon is to be displayed); + * 'fm-nomkdir' - when 'Make folder' action is unavailable (empty($fm->options->subdirs) == true) + * + * Element with class 'filemanager-container' will be holding evens for dnd upload (dragover, etc.). + * It will have class: + * 'dndupload-ready' - when a file is being dragged over the browser + * 'dndupload-over' - when file is being dragged over this filepicker (additional to 'dndupload-ready') + * 'dndupload-uploading' - during the upload process (note that after dnd upload process is + * over, the file manager will refresh the files list and therefore will have for a while class + * fm-updating. Both waiting processes should look similar so the images don't jump for user) + * + * If browser supports Drag-and-drop, the body element will have class 'dndsupported', + * otherwise - 'dndnotsupported'; + * + * Element with class 'fp-content' will be populated with files list; + * Element with class 'fp-btn-add' will hold onclick event for adding a file (opening filepicker); + * Element with class 'fp-btn-mkdir' will hold onclick event for adding new folder; + * Element with class 'fp-btn-download' will hold onclick event for download action; + * + * Element with class 'fp-path-folder' is a template for one folder in path toolbar. + * It will hold mouse click event and will be assigned classes first/last/even/odd respectfully. + * Parent element will receive class 'empty' when there are no folders to be displayed; + * The content of subelement with class 'fp-path-folder-name' will be substituted with folder name; + * + * Element with class 'fp-viewbar' will have the class 'enabled' or 'disabled' when view mode + * can be changed or not; + * Inside element with class 'fp-viewbar' there are expected elements with classes + * 'fp-vb-icons', 'fp-vb-tree' and 'fp-vb-details'. They will handle onclick events to switch + * between the view modes, the last clicked element will have the class 'checked'; + * + * @param form_filemanager $fm + * @return string + */ + private function fm_print_generallayout($fm) { + global $OUTPUT; + $options = $fm->options; + $client_id = $options->client_id; + $straddfile = get_string('addfile', 'repository'); + $strmakedir = get_string('makeafolder', 'moodle'); + $strdownload = get_string('downloadfolder', 'repository'); + $strloading = get_string('loading', 'repository'); + $strdroptoupload = get_string('droptoupload', 'moodle'); + $icon_progress = $OUTPUT->pix_icon('i/loading_small', $strloading).''; + $restrictions = $this->fm_print_restrictions($fm); + $strdndenabled = get_string('dndenabled_insentence', 'moodle').$OUTPUT->help_icon('dndenabled'); + $strdndenabledinbox = get_string('dndenabled_inbox', 'moodle'); + $loading = get_string('loading', 'repository'); + + $html = ' +New folder name:
++ '.get_string('create').' + '.get_string('cancel').' +
'.get_string('loading', 'repository').'
+