Index: message/send.php =================================================================== --- message/send.php (revision 146) +++ message/send.php (revision 147) @@ -1,4 +1,4 @@ -stylesheets as $stylesheet) { @@ -36,6 +35,12 @@ echo $stylesheetshtml; include($CFG->javascript); + require_once($CFG->libdir .'/editor/htmlEditor.class.php'); + $htmlEditorObject = new htmlEditor(); + echo $htmlEditorObject->configure(); + + echo ' '; + /// Script parameters $userid = required_param('id', PARAM_INT); $message = optional_param('message', '', PARAM_CLEANHTML); @@ -62,6 +67,7 @@ } } + echo ''; if ($message!='' and confirm_sesskey()) { /// Current user has just sent a message @@ -89,28 +95,23 @@ add_to_log(SITEID, 'message', 'write', 'history.php?user1='.$user->id.'&user2='.$USER->id.'#m'.$messageid, $user->id); } - echo ' '; - - - echo ''; - echo '
'; echo '
'; - echo '
'; + echo '
'; echo ''; echo ''; $usehtmleditor = (can_use_html_editor() && get_user_preferences('message_usehtmleditor', 0)); if ($usehtmleditor) { - echo '
'; - print_textarea($usehtmleditor, 9, 200, 0, 0, 'message', ''); - echo '
'; - echo ''; - use_html_editor('message', 'formatblock subscript superscript copy cut paste clean undo redo justifyleft justifycenter justifyright justifyfull lefttoright righttoleft insertorderedlist insertunorderedlist outdent indent inserthorizontalrule createanchor nolink inserttable'); + echo '
'; + print_textarea($usehtmleditor, 5, 34, 0, 0, 'message', '', 0, false, '', 'form-textarea-simple'); + echo '
'; + echo ''; + //use_html_editor('message', 'formatblock subscript superscript copy cut paste clean undo redo justifyleft justifycenter justifyright justifyfull lefttoright righttoleft insertorderedlist insertunorderedlist outdent indent inserthorizontalrule createanchor nolink inserttable'); echo ''; } else { print_textarea(false, 5, 34, 0, 0, 'message', ''); echo ''; - echo '
'; + echo '
'; } echo '
'; echo ''; @@ -118,11 +119,15 @@ notify(get_string('mailsent', 'message'), 'notifysuccess'); } echo '
'.get_string('noframesjs', 'message').'
'; - echo '
'; - echo "\n\n\n"; + echo << +// + + +EOF; echo ''; } Index: lib/editorlib.php =================================================================== --- lib/editorlib.php (revision 146) +++ lib/editorlib.php (revision 147) @@ -1,13 +1,13 @@ -cfg = &$CFG; $this->user = &$USER; $this->courseid = NULL; - } - - /** - * PHP5 style class constructor. - * - */ - function __construct() { - $this->editorObject(); - } + } /** * Method to load necessary editor codes to @@ -99,16 +89,14 @@ break; case 2: case 'tinymce': - array_push($CFG->editorsrc, "$editorbaseurl/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php"); + array_push($CFG->editorsrc, "$editorbaseurl/tinymce/jscripts/tiny_mce/tiny_mce.js"); array_push($CFG->editorsrc, "$editorbaseurl/tinymce/moodledialog.js"); $classfile = "$editorbasedir/tinymce/tinymce.class.php"; include_once($classfile); return (new tinymce($courseid)); break; } - } - } /** @@ -123,6 +111,6 @@ echo ''; exit; } - } -?> \ No newline at end of file + +?> Index: lib/deprecatedlib.php =================================================================== --- lib/deprecatedlib.php (revision 146) +++ lib/deprecatedlib.php (revision 147) @@ -1689,4 +1689,7 @@ die; } +//function use_html_editor($name='', $editorhidebuttons='', $id='') { + // error('use_html_editor() not available anymore'); +//} ?> Index: lib/moodlelib.php =================================================================== --- lib/moodlelib.php (revision 146) +++ lib/moodlelib.php (revision 147) @@ -6517,6 +6517,9 @@ } else if (check_browser_version('Gecko', 20030516)) { return 'Gecko'; } +else if (check_browser_version('Safari', 525)) { +return 'KHTML'; +} } return false; } Index: lib/adminlib.php =================================================================== --- lib/adminlib.php (revision 146) +++ lib/adminlib.php (revision 147) @@ -1911,7 +1911,7 @@ } return format_admin_setting($this, $this->visiblename, - '
', + '
', $this->description, true, '', $defaultinfo, $query); } } Index: lib/editor/htmlEditor.class.php =================================================================== --- lib/editor/htmlEditor.class.php (revision 0) +++ lib/editor/htmlEditor.class.php (revision 147) @@ -0,0 +1,210 @@ +htmleditor) or (!$CFG->htmleditor)) { + + return; + + } + + + + if ($editor == '') { + + $editor = (isset($CFG->defaulthtmleditor) ? $CFG->defaulthtmleditor : ''); + + } + + + + if (isset($configured[$editor])) { + + return $configured[$editor]; + + } + + + + $configuration = array(); + + + + switch ($editor) { + + + + case 'tinymce': + + $configuration[] = $CFG->httpswwwroot ."/lib/editor/tinymce/jscripts/tiny_mce/tiny_mce.js"; + + $configuration[] = $CFG->httpswwwroot ."/lib/editor/tinymce.js.php?course=". $courseid; + + $configured['tinymce'] = true; + + break; + + + + case 'fckeditor': + + $configuration[] = $CFG->httpswwwroot ."/lib/editor/fckeditor/fckeditor.js"; + + $configuration[] = $CFG->httpswwwroot ."/lib/editor/fckeditor.js.php?course=". $courseid; + + $configured['fckeditor'] = true; + + break; + + + +// case 'xinha': + +// $configuration = << + +// _editor_url = "{$CFG->wwwroot}/lib/editor/xinha/" + +// _editor_lang = "en"; + +// _editor_skin = "blue-look"; + +// + +// + +// + +//EOF; + +// break; + +// + +// case 'yuirte': + +// $configuration = << + +// + +// + +// + +// + +// + +// + +// + +// + +// + +// + +// + +// + +// + +// + +// + +//EOF; + +// break; + + + + default: + + $configured[$editor] = false; + + break; + + + + } + + + + if (isset($CFG->editorsrc) && is_array($CFG->editorsrc)) { + + $CFG->editorsrc = $configuration + $CFG->editorsrc; + + } else { + + $CFG->editorsrc = $configuration; + + } + + + + return $configured[$editor]; + + } + +} + + + +?> + Index: lib/weblib.php =================================================================== --- lib/weblib.php (revision 146) +++ lib/weblib.php (revision 147) @@ -2730,6 +2730,12 @@ $bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"'; +//john 3 below +require_once($CFG->libdir .'/editor/htmlEditor.class.php'); + $htmlEditorObject = new htmlEditor(); + $htmlEditor = $htmlEditorObject->configure(NULL, $COURSE->id); + + ob_start(); include($CFG->header); $output = ob_get_contents(); @@ -4973,12 +4979,11 @@ * @param int $courseid ? * @todo Finish documenting this function */ -function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $value='', $courseid=0, $return=false, $id='') { -/// $width and height are legacy fields and no longer used as pixels like they used to be. -/// However, you can set them to zero to override the mincols and minrows values below. +function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $value='', $obsolete=0, $return=false, $id='', $editorclass='form-textarea-advanced') { + /// $width and height are legacy fields and no longer used as pixels like they used to be. + /// However, you can set them to zero to override the mincols and minrows values below. - global $CFG, $COURSE, $HTTPSPAGEREQUIRED; - static $scriptcount = 0; // For loading the htmlarea script only once. + global $CFG, $COURSE, $HTTPSPAGEREQUIRED, $THEME; $mincols = 65; $minrows = 10; @@ -4988,40 +4993,22 @@ $id = 'edit-'.$name; } - if ( empty($CFG->editorsrc) ) { // for backward compatibility. - if (empty($courseid)) { - $courseid = $COURSE->id; + if ( empty($CFG->editorsrc) && $usehtmleditor ) { // for backward compatibility. + if ($height && ($rows < $minrows)) { + $rows = $minrows; } - - if ($usehtmleditor) { - if (!empty($courseid) and has_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $courseid))) { - $httpsrequired = empty($HTTPSPAGEREQUIRED) ? '' : '&httpsrequired=1'; - // needed for course file area browsing in image insert plugin - $str .= ($scriptcount < 1) ? ''."\n" : ''; - } else { - $httpsrequired = empty($HTTPSPAGEREQUIRED) ? '' : '?httpsrequired=1'; - $str .= ($scriptcount < 1) ? ''."\n" : ''; - - } - $str .= ($scriptcount < 1) ? ''."\n" : ''; - $scriptcount++; - - if ($height) { // Usually with legacy calls - if ($rows < $minrows) { - $rows = $minrows; - } - } - if ($width) { // Usually with legacy calls - if ($cols < $mincols) { - $cols = $mincols; - } - } + if ($width && ($cols < $mincols)) { + $cols = $mincols; } } - $str .= ''."\n"; if ($usehtmleditor) { + $str_toggle = ''. get_string('editortoggle') .''; // Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556) + $str .= '
'; $str .= ''; + $str .= '
'; } if ($return) { @@ -5044,6 +5036,7 @@ echo $str; } + /** * Sets up the HTML editor on textareas in the current page. * If a field name is provided, then it will only be Index: lib/form/htmleditor.php =================================================================== --- lib/form/htmleditor.php (revision 146) +++ lib/form/htmleditor.php (revision 147) @@ -60,13 +60,11 @@ } function toHtml(){ - if ($this->_canUseHtmlEditor && !$this->_flagFrozen){ - ob_start(); - use_html_editor($this->getName(), '', $this->getAttribute('id')); - $script=ob_get_clean(); - } else { - $script=''; - } + //if ($this->_canUseHtmlEditor && !$this->_flagFrozen){ + // $script = ''; + //} else { + // $script=''; + //} if ($this->_flagFrozen) { return $this->getFrozenHtml(); } else { @@ -78,9 +76,9 @@ $this->_options['height'], $this->getName(), preg_replace("/(\r\n|\n|\r)/", ' ',$this->getValue()), - $this->_options['course'], + 0, // unused anymore true, - $this->getAttribute('id')).$script; + $this->getAttribute('id'));//.$script; } } //end func toHtml Index: admin/settings.php =================================================================== --- admin/settings.php (revision 146) +++ admin/settings.php (revision 147) @@ -164,7 +164,7 @@ } if (!empty($CFG->adminusehtmleditor)) { - use_html_editor(); + //use_html_editor(); } print_footer(); Index: admin/settings/appearance.php =================================================================== --- admin/settings/appearance.php (revision 146) +++ admin/settings/appearance.php (revision 147) @@ -51,6 +51,7 @@ // "htmleditor" settingpage $temp = new admin_settingpage('htmleditor', get_string('htmleditor', 'admin')); $temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1)); + /* $temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), '#ffffff', PARAM_NOTAGS)); $temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif', PARAM_NOTAGS)); $temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'), '', PARAM_NOTAGS)); @@ -62,6 +63,7 @@ } $temp->add(new admin_setting_special_editorhidebuttons()); $temp->add(new admin_setting_emoticons()); + */ $ADMIN->add('appearance', $temp); // "htmlsettings" settingpage Index: config.php =================================================================== --- config.php (revision 146) +++ config.php (revision 147) @@ -21,6 +21,8 @@ $CFG->passwordsaltmain = 'ciWL(JV4df:o)(+x`qNUH::bY F'; require_once("$CFG->dirroot/lib/setup.php"); +$CFG->validateforms = 'server'; +$CFG->defaulthtmleditor='tinymce'; // MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, // RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE. ?> \ No newline at end of file Index: config-dist.php =================================================================== --- config-dist.php (revision 146) +++ config-dist.php (revision 147) @@ -389,6 +389,8 @@ } die; } +$CFG->validateforms = 'server'; +$CFG->defaulthtmleditor='tinymce'; // MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, // RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE. ?> Index: install.php =================================================================== --- install.php (revision 146) +++ install.php (revision 147) @@ -559,6 +559,9 @@ $str .= "\r\n"; $str .= 'require_once("$CFG->dirroot/lib/setup.php");'."\r\n"; + // $str .= '// Force server-side form validation; required for FCKeditor'."\r\n"; + $str .= '$CFG->validateforms = \'server'."';\r\n"; + $str .= '$CFG->defaulthtmleditor=\'tinymce'."';\r\n"; $str .= '// MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES,'."\r\n"; $str .= '// RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.'."\r\n"; $str .= '?>'; Index: course/editsection.html =================================================================== --- course/editsection.html (revision 146) +++ course/editsection.html (revision 147) @@ -16,7 +16,7 @@ - summary); ?> + summary, 0, false, 'summary'); ?>