File/Picture Upload

' + $o .= "\n
\n". '

' . '

'. "\n"; } } @@ -1607,9 +1607,9 @@ function ewiki_page_edit_preview(&$data) { $preview_text=$GLOBALS["ewiki_plugins"]["render"][0]($_REQUEST["content"], 1, EWIKI_ALLOW_HTML || (@$data["flags"]&EWIKI_DB_F_HTML)); return( '

' . "

" - . "

" . ewiki_t("PREVIEW") . "

\n" + . "

" . ewiki_t("PREVIEW") . "

\n" . format_text($preview_text, $moodle_format) - . "

" + . "

" . "

" ); #### END MOODLE CHANGES @@ -1628,15 +1628,15 @@ function ewiki_control_links($id, &$data, $action) { $o = "\n" . '

' - . "\n
\n" + . "\n
\n" . "

" . "\n"; if (@$data["forced_version"]) { $o .= ' '; + '' . + '' . + ' '; } else { foreach ($action_links as $action => $title) @@ -2540,9 +2540,9 @@ function ewiki_binary($break=0) { File/Picture UploadYour uploaded file was saved as
+//-->Your uploaded file was saved as
[$id] -.

+.

EOF; } } @@ -3018,7 +3018,7 @@ function ewiki_auth($id, &$data, $action, $ring=false, $request_auth=0) { $ok = true; $ewiki_errmsg=""; -#echo "_a($id,dat,$action,$ring,$request_auth)
\n"; +#echo "_a($id,dat,$action,$ring,$request_auth)
\n"; if (EWIKI_PROTECTED_MODE) { @@ -3169,7 +3169,7 @@ function ewiki_eventually_initialize(&$id, &$data, &$action) { closedir($dh); } else { - echo "ewiki error: could not read from directory ". realpath($path) ."
\n"; + echo "ewiki error: could not read from directory ". realpath($path) ."
\n"; } } #### END MOODLE CHANGE diff --git a/mod/wiki/ewiki/plugins/aview/backlinks.php b/mod/wiki/ewiki/plugins/aview/backlinks.php index 9977548f1b..110dbaf477 100755 --- a/mod/wiki/ewiki/plugins/aview/backlinks.php +++ b/mod/wiki/ewiki/plugins/aview/backlinks.php @@ -15,7 +15,7 @@ function ewiki_view_append_backlinks($id, $data, $action) { foreach ($pages as $id) { $o .= ' '.$id.''; } - ($o) && ($o = "

".get_string('backlinks', 'wiki').":
$o

\n"); + ($o) && ($o = "

".get_string('backlinks', 'wiki').":
$o

\n"); return($o); } diff --git a/mod/wiki/ewiki/plugins/aview/downloads.php b/mod/wiki/ewiki/plugins/aview/downloads.php index c74e72ffdc..efb744ae19 100644 --- a/mod/wiki/ewiki/plugins/aview/downloads.php +++ b/mod/wiki/ewiki/plugins/aview/downloads.php @@ -19,7 +19,7 @@ $ewiki_t["de"]["ATTACHMENTS"] = "Anh function ewiki_view_append_attachments($id, $data, $action) { - $o = '

' . ewiki_t("ATTACHMENTS") . '

'; $scan = 's:7:"section";' . serialize($id); diff --git a/mod/wiki/ewiki/plugins/email_protect.php b/mod/wiki/ewiki/plugins/email_protect.php index 55cfc15afe..e7673079a1 100644 --- a/mod/wiki/ewiki/plugins/email_protect.php +++ b/mod/wiki/ewiki/plugins/email_protect.php @@ -118,21 +118,21 @@ (empty($url)) and ($url = ewiki_script("", EWIKI_PAGE_EMAIL)); - $html .= ewiki_t($text) . "

\n"; + $html .= ewiki_t($text) . "

\n"; $html .= '

'; + $html .= ' ' . ewiki_t("PROTE4") . '

'; + $html .= '

'; if (EWIKI_FAKE_EMAIL_LOOP) { - $html .= "\n" . ewiki_t("PROTE7") . "
\n"; + $html .= "\n" . ewiki_t("PROTE7") . "
\n"; $html .= ewiki_email_protect_feedbots(); } @@ -141,7 +141,7 @@ $email = ewiki_email_protect_encode($email, -1); - $html .= ewiki_t("PROTE6") . "
"; + $html .= ewiki_t("PROTE6") . "
"; $html .= '' . $email . ''; if (EWIKI_HTTP_HEADERS && empty($_COOKIE[EWIKI_UP_NOSPAMBOT])) { @@ -276,13 +276,13 @@ $html .= ''.$traps[rand(0, $n_trp)].''; if (($rl = 1 + @$_REQUEST[EWIKI_UP_REQUESTLV]) < EWIKI_FAKE_EMAIL_LOOP) { - $html .= ",\n" . '
ewiki_email_protect_encode($m, 1), EWIKI_UP_REQUESTLV=>"$rl" ) - ) . '">' . ewiki_t("PROTE5") . '
' . "\n"; + ) . '">' . ewiki_t("PROTE5") . '
' . "\n"; ($rl > 1) && sleep(3); } diff --git a/mod/wiki/ewiki/plugins/init.php b/mod/wiki/ewiki/plugins/init.php index 1f5ac26dbc..2359c5a9d0 100644 --- a/mod/wiki/ewiki/plugins/init.php +++ b/mod/wiki/ewiki/plugins/init.php @@ -36,23 +36,23 @@ function ewiki_initialization_wizard($id, &$data, &$action) { elseif (empty($_REQUEST["init"])) { $o = "

WikiSetupWizard

\n"; - $o .= "You don't have any pages in your Wiki yet, so we should try to read-in the default ones from init-pages/ now.

"; + $o .= "You don't have any pages in your Wiki yet, so we should try to read-in the default ones from init-pages/ now.

"; $o .= '"now")).'">[InitializeWikiDatabase]'; $o .= " "; $o .= '"this")).'">[NoThanks]'; - $o .= "

"; + $o .= "

"; #-- analyze and print settings and misconfigurations $pf_db = $ewiki_plugins["database"][0]; $db = substr($pf_db, strrpos($pf_db, "_") + 1); $o .= ''; $o .= '

DatabaseBackend

'; - $o .= "" . $db . "
"; + $o .= "" . $db . "
"; if ($db == "files") { $o .= "_DBFILES_DIR='" . EWIKI_DBFILES_DIRECTORY . "'"; if (strpos(EWIKI_DBFILES_DIRECTORY, "tmp")) { - $o .= "
Warning: Storing your pages into a temporary directory is not what you want (there they would get deleted randomly), except for testing purposes of course. See the README."; + $o .= "
Warning: Storing your pages into a temporary directory is not what you want (there they would get deleted randomly), except for testing purposes of course. See the README."; } } else { @@ -65,10 +65,10 @@ function ewiki_initialization_wizard($id, &$data, &$action) { #-- more diagnosis if (ini_get("magic_quotes")) { - $o.= "Warning: Your PHP interpreter has enabled the ugly and outdated 'magic_quotes'. This will lead to problems, so please ask your provider to correct it; or fix it yourself with .htaccess settings as documented in the README. Otherwise don't forget to include() the fragments/strip_wonderful_slashes.php (it's ok to proceed for the moment).

"; + $o.= "Warning: Your PHP interpreter has enabled the ugly and outdated 'magic_quotes'. This will lead to problems, so please ask your provider to correct it; or fix it yourself with .htaccess settings as documented in the README. Otherwise don't forget to include() the fragments/strip_wonderful_slashes.php (it's ok to proceed for the moment).

"; } if (ini_get("register_globals")) { - $o.= "Security warning: The horrible 'register_globals' setting is enabled. Without always using fragments/strike_register_globals.php or letting your provider fix that, you could get into trouble some day.

"; + $o.= "Security warning: The horrible 'register_globals' setting is enabled. Without always using fragments/strike_register_globals.php or letting your provider fix that, you could get into trouble some day.

"; } return('

' . $o . '

'); @@ -103,7 +103,7 @@ function ewiki_initialization_wizard($id, &$data, &$action) { closedir($dh); } else { - return("ewiki error: could not read from directory ". realpath($path) ."
\n"); + return("ewiki error: could not read from directory ". realpath($path) ."
\n"); } #-- try to view/ that newly inserted page diff --git a/mod/wiki/ewiki/plugins/markup/footnotes.php b/mod/wiki/ewiki/plugins/markup/footnotes.php index 6f9021d893..8c853d04cd 100755 --- a/mod/wiki/ewiki/plugins/markup/footnotes.php +++ b/mod/wiki/ewiki/plugins/markup/footnotes.php @@ -52,7 +52,7 @@ function ewiki_format_source_footnotes (&$source) { $source .= "\n----"; } $source .= "\n" . - "·$notenum ". $footnote . "\n
"; + "·$notenum ". $footnote . "\n
"; } } diff --git a/mod/wiki/ewiki/plugins/moodle/diff.php b/mod/wiki/ewiki/plugins/moodle/diff.php index 5e234167a2..9e444bd5d4 100755 --- a/mod/wiki/ewiki/plugins/moodle/diff.php +++ b/mod/wiki/ewiki/plugins/moodle/diff.php @@ -81,32 +81,32 @@ $i2 = $i; while ($rm = $diff0[$i2++]) { if($wiki->htmlmode == 2) { - $o .= "-$rm
\n"; + $o .= "-$rm
\n"; } else { - $o .= "-$rm
\n"; + $o .= "-$rm
\n"; } unset($diff0[$i2-1]); } if (in_array($line, $diff2)) { if($wiki->htmlmode == 2) { - $o .= "+$line
\n"; + $o .= "+$line
\n"; } else { - $o .= "+$line
\n"; + $o .= "+$line
\n"; } } else { if($wiki->htmlmode == 2) { $o .= "$line\n"; } else { - $o .= " $line
\n"; + $o .= " $line
\n"; } } } foreach ($diff0 as $rm) { - $o .= "- $rm
\n"; + $o .= "- $rm
\n"; } return($o); diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php index 628a12df09..d472b4adbc 100644 --- a/mod/wiki/ewiki/plugins/moodle/downloads.php +++ b/mod/wiki/ewiki/plugins/moodle/downloads.php @@ -47,45 +47,45 @@ $ewiki_upload_sections = array( #-- text, translations -$ewiki_t["en"]["UPLOAD0"] = "Use this form to upload an arbitrary binary file into the wiki:
"; +$ewiki_t["en"]["UPLOAD0"] = "Use this form to upload an arbitrary binary file into the wiki:
"; $ewiki_t["en"]["UPL_NEWNAM"] = "Save with different filename"; $ewiki_t["en"]["UPL_INSECT"] = "Upload into section"; $ewiki_t["en"]["UPL_TOOLARGE"] = "Your upload has been rejected, because that file was too large!"; -$ewiki_t["en"]["UPL_REJSECT"] = 'The given download section "$sect" has been rejected. Please only use the default ones, or tell the WikiAdmin to reenable per-page uploads; else others can\'t find your uploaded files easily.

'; -$ewiki_t["en"]["UPL_OK"] = "Your file was uploaded correctly, please see ".EWIKI_PAGE_DOWNLOAD.".

"; -$ewiki_t["en"]["UPL_ERROR"] = "We're sorry, but something went wrong during the file upload.

"; -$ewiki_t["en"]["DWNL_SEEUPL"] = 'See also FileUpload, this page is only about downloading.

'; -$ewiki_t["en"]["DWNL_NOFILES"] = "No files uploaded yet.
\n"; +$ewiki_t["en"]["UPL_REJSECT"] = 'The given download section "$sect" has been rejected. Please only use the default ones, or tell the WikiAdmin to reenable per-page uploads; else others can\'t find your uploaded files easily.

'; +$ewiki_t["en"]["UPL_OK"] = "Your file was uploaded correctly, please see ".EWIKI_PAGE_DOWNLOAD.".

"; +$ewiki_t["en"]["UPL_ERROR"] = "We're sorry, but something went wrong during the file upload.

"; +$ewiki_t["en"]["DWNL_SEEUPL"] = 'See also FileUpload, this page is only about downloading.

'; +$ewiki_t["en"]["DWNL_NOFILES"] = "No files uploaded yet.
\n"; $ewiki_t["en"]["file"] = "File"; $ewiki_t["en"]["of"] = "of"; $ewiki_t["en"]["comment"] = "Comment"; $ewiki_t["en"]["dwnl_section"] = "download section"; $ewiki_t["en"]["DWNL_ENTRY_FORMAT"] = - '

$icon$title$size
'. - 'uploaded on $time, downloaded $hits times
'. - '($id)
'. + '

$icon$title$size
'. + 'uploaded on $time, downloaded $hits times
'. + '($id)
'. '$section'.'file is of type $type'. - '$comment'."

\n"; + '$comment'."

\n"; -$ewiki_t["de"]["UPLOAD0"] = "Mit diesem Formular kannst du beliebige Dateien in das Wiki abspeichern:
"; +$ewiki_t["de"]["UPLOAD0"] = "Mit diesem Formular kannst du beliebige Dateien in das Wiki abspeichern:
"; $ewiki_t["de"]["UPL_NEWNAM"] = "Mit unterschiedlichem Dateinamen speichern"; $ewiki_t["de"]["UPL_INSECT"] = "Hochladen in Bereich:"; $ewiki_t["de"]["UPL_TOOLARGE"] = "Deine Datei wurde nicht aufgenommen, weil sie zu groß war!"; -$ewiki_t["de"]["UPL_REJSECT"] = 'Der angegebene Download-Bereich "$sect" wird nicht verwendet. Bitte verwende einen von den voreingestellten Bereichen, damit Andere die Datei später auch finden können, oder frag den Administrator das Hochladen für beliebige Seiten zu aktivieren.

'; -$ewiki_t["de"]["UPL_OK"] = "Deine Datei wurde korrekt hochgeladen, sehe einfach auf der ".EWIKI_PAGE_DOWNLOAD." nach.

"; -$ewiki_t["de"]["UPL_ERROR"] = "'Tschuldige, aber irgend etwas ist während des Hochladens gründlich schief gelaufen.

"; -$ewiki_t["de"]["DWNL_SEEUPL"] = 'Siehe auch DateiHochladen, auf dieser Seite stehen nur die Downloads.

'; -$ewiki_t["de"]["DWNL_NOFILES"] = "Noch keine Dateien hochgeladen.
\n"; +$ewiki_t["de"]["UPL_REJSECT"] = 'Der angegebene Download-Bereich "$sect" wird nicht verwendet. Bitte verwende einen von den voreingestellten Bereichen, damit Andere die Datei später auch finden können, oder frag den Administrator das Hochladen für beliebige Seiten zu aktivieren.

'; +$ewiki_t["de"]["UPL_OK"] = "Deine Datei wurde korrekt hochgeladen, sehe einfach auf der ".EWIKI_PAGE_DOWNLOAD." nach.

"; +$ewiki_t["de"]["UPL_ERROR"] = "'Tschuldige, aber irgend etwas ist während des Hochladens gründlich schief gelaufen.

"; +$ewiki_t["de"]["DWNL_SEEUPL"] = 'Siehe auch DateiHochladen, auf dieser Seite stehen nur die Downloads.

'; +$ewiki_t["de"]["DWNL_NOFILES"] = "Noch keine Dateien hochgeladen.
\n"; $ewiki_t["de"]["file"] = "Datei"; $ewiki_t["de"]["of"] = "von"; $ewiki_t["de"]["comment"] = "Kommentar"; $ewiki_t["de"]["dwnl_section"] = "Download Bereich"; $ewiki_t["de"]["DWNL_ENTRY_FORMAT"] = - '

$icon$title$size
'. - 'am $time hochgeladen, $hits mal abgerufen
'. - '($id)
'. + '

$icon$title$size
'. + 'am $time hochgeladen, $hits mal abgerufen
'. + '($id)
'. '$section'.'Datei ist vom Typ $type'. - '$comment'."

\n"; + '$comment'."

\n"; @@ -105,10 +105,10 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") { '

' . - ''.ewiki_t("file").'

' . - '

'; + ''.ewiki_t("file").'

' . + '

'; - $o .= '' . ewiki_t("comment") . '

'; + $o .= '' . ewiki_t("comment") . '

'; if (empty($ewiki_upload_sections[$def_sec])) { $ewiki_upload_sections[$def_sec] = $def_sec; @@ -117,14 +117,14 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") { if (empty($def_sec)) { $def_sec = $_REQUEST["section"]; } - $o .= ''.ewiki_t("UPL_INSECT").'
'; foreach ($ewiki_upload_sections as $id => $title) { $o .= ''; } - $o .= '

'; + $o .= '

'; } - $o .= ''.ewiki_t("UPL_NEWNAM").'

'; + $o .= ''.ewiki_t("UPL_NEWNAM").'

'; $o .= '

'; @@ -215,7 +215,7 @@ function ewiki_page_filedownload($id, $data, $action, $def_sec="") { "orderby"=>$orderby, "section" => $sec)) . '">' . $title . ""; } - $o .= '

'.implode(" · ", $oa).'

'; + $o .= '

'.implode(" · ", $oa).'

'; } } @@ -263,7 +263,7 @@ function ewiki_page_filedownload($id, $data, $action, $def_sec="") { "orderby"=>$orderby, "section"=>$section, EWIKI_UP_PAGENUM=>$n)) . '">[' . $n . "] "; } - $o_nl .= '
'; + $o_nl .= '
'; $o .= $o_nl; } $sorted = array_slice($sorted, $pnum * EWIKI_LIST_LIMIT, EWIKI_LIST_LIMIT); @@ -316,7 +316,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) { $p_section = $p_section ? $p_section : $meta["section"]; $p_comment = strlen($meta["comment"]) ? '

'. str_replace('

', '', str_replace('

', '', - ewiki_format($meta["comment"]))) . '

' : "
"; + ewiki_format($meta["comment"]))) . '

' : "
"; $p_icon = ""; /*foreach ($ewiki_binary_icons as $str => $i) { @@ -337,7 +337,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) { $info->icon = ($p_icon ? '

' : ''); $info->time = $p_time; $info->hits = $p_hits; - $info->section = ($show_section ? ewiki_t('dwnl_section') . ": $p_section
" : ''); + $info->section = ($show_section ? ewiki_t('dwnl_section') . ": $p_section
" : ''); $info->type = $p_ct; $info->url = ewiki_script_binary("", $row["id"]); $info->title = $p_title; @@ -353,19 +353,19 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) { fullname($user).""; } - $o .= ''.$info->icon.$info->title.''.$info->size.'
'. + $o .= ''.$info->icon.$info->title.''.$info->size.'
'. $info->comment. - $info->section." ".get_string("fileisoftype","wiki").": ".$info->type.'
'. + $info->section." ".get_string("fileisoftype","wiki").": ".$info->type.'
'. get_string("uploadedon","wiki").": ".$info->time.", ". - ' by '.$value.'
'. - get_string("downloadtimes","wiki",$info->hits)."
". -// '('.$info->id.")
". - '

'; + ' by '.$value.'
'. + get_string("downloadtimes","wiki",$info->hits)."
". +// '('.$info->id.")
". + '

'; } else { // global $moodle_format; // from wiki/view.php - $o .= ''.$info->icon.$info->title.''.$info->size.'
'. - $info->comment.'

'; + $o .= ''.$info->icon.$info->title.''.$info->size.'
'. + $info->comment.'

'; // $o = format_text($o, $moodle_format); } diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php index 4127c33a4d..59c9e57334 100644 --- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php +++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php @@ -62,35 +62,35 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) { $url = ewiki_script("", "WikiExport"); $ret = ewiki_make_title($id, $id, 2); - $ret .= ($cont&&$cont!==true)?$cont."

\n":""; + $ret .= ($cont&&$cont!==true)?$cont."

\n":""; $ret .= get_string("wikiexportcomment","wiki"); - $ret .= "

\n". + $ret .= "

\n". '

'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". "\n"; // Export binaries too ? if(!$wiki->ewikiacceptbinary) { - $ret.=''.$exportdestinations[0]."\n"; + $ret.=''.$exportdestinations[0]."\n"; } else { - $ret.=''."\n"; + $ret.=''."\n"; } $ret.="\n"; if($wiki->ewikiacceptbinary) { $ret.=" \n". ' \n". " \n". " \n"; } $ret.=" \n". ' \n". " \n". " \n"; $exportformats=array( "0" => get_string("plaintext","wiki") , "1" => get_string("html","wiki")); @@ -101,7 +101,7 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) { if($wiki->htmlmode!=2) { $ret.= choose_from_menu($exportformats, "exportformats", $_REQUEST["exportformats"], "", "", "", true)."\n"; } else { - $ret.= ''. + $ret.= ''. get_string("html","wiki"); } $ret.=" \n". @@ -121,14 +121,14 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) { ' \n". " \n". " \n". "

'.get_string("withbinaries","wiki").":	\n". - ' \n". + ' \n". "
'.get_string("withvirtualpages","wiki").":	\n". - ' \n". + ' \n". "
'.get_string("exportto","wiki").":	\n"; if(count($exportdestinations)==1) { - $ret.=''.$exportdestinations[0]."\n"; + $ret.=''.$exportdestinations[0]."\n"; } else { $ret.=choose_from_menu($exportdestinations, "exportdestinations", $_REQUEST["exportdestinations"], "", "", "", true)."\n"; } $ret.="

\n". - ' '."\n". + ' '."\n". "\n"; "

\n"; return $ret; @@ -211,7 +211,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir } #print "

"; print_r($a_validpages); print "

"; - #print "

"; print_r($a_pagelist); print "

"; + #print "

"; print_r($a_pagelist); print "

"; $a_sitemap = ewiki_sitemap_create($wiki_entry->pagename, $a_validpages, 99, 0); if ($a_pagelist) { @@ -296,7 +296,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir } break; case (EWIKI_DB_F_BINARY): - #print "Binary: $row[id]
"; + #print "Binary: $row[id]
"; if (($row["meta"]["class"]=="image" || $row["meta"]["class"]=="file") && ($exportbinaries)) { # Copy files to the appropriate directory $fn= moodle_binary_get_path($id, $row["meta"], $course, $wiki, $userid, $groupid); @@ -434,7 +434,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir #exit(); return false; } else { - return get_string("exportsuccessful","wiki")."
"; + return get_string("exportsuccessful","wiki")."
"; } } } diff --git a/mod/wiki/ewikimoodlelib.php b/mod/wiki/ewikimoodlelib.php index 4d5e54dff9..11ee901f27 100644 --- a/mod/wiki/ewikimoodlelib.php +++ b/mod/wiki/ewikimoodlelib.php @@ -265,7 +265,7 @@ function ewiki_database_moodle($action, &$args, $sw1, $sw2) { #mysql_query("DELETE FROM " . EWIKI_DB_TABLE_NAME ." # WHERE pagename='$id' AND version=$version"); - # print "DELETING wiki:".$wiki_entry->id."Pagename: $id Version: $version
\n"; + # print "DELETING wiki:".$wiki_entry->id."Pagename: $id Version: $version
\n"; delete_records(EWIKI_DB_TABLE_NAME,"wiki", $wiki_entry->id,"pagename",$id,"version",$version); break; diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php index c496c33d4a..c747fa1c4f 100644 --- a/mod/wiki/lib.php +++ b/mod/wiki/lib.php @@ -918,13 +918,13 @@ function wiki_print_search_form($cmid, $search="", $userid, $groupid, $return=fa # TODO: Add Group and User !!! $output = ""; if ($return) { @@ -1053,8 +1053,8 @@ function wiki_admin_setpageflags_list($pageflagstatus) { foreach ($FD as $n=>$str) { $cell_flags .=''.$str. ' '; + . (($data["flags"] & $n) ? "CHECKED=\"checked\"" : "") + . ' />'.$str. ' '; } if($pageflagstatus) { $table->data[]=array($cell_pagename, $cell_flags, $pageflagstatus[$id]); @@ -1111,17 +1111,17 @@ function wiki_admin_remove_list($listall="") { /// User wants to see all pages if ($listall) { while ($row = $result->get()) { - $selected[$row["id"]] = get_string("listall","wiki")."
"; + $selected[$row["id"]] = get_string("listall","wiki")."
"; } } while ($page = $result->get()) { $id = $page["id"]; $page = ewiki_database("GET", array("id"=>$id)); $flags = $page["flags"]; - #print "$id ".strlen(trim(($page["content"])))."
"; + #print "$id ".strlen(trim(($page["content"])))."
"; if (!strlen(trim(($page["content"]))) && !($flags & EWIKI_DB_F_BINARY)) { - @$selected[$id] .= get_string("emptypage","wiki")."
"; + @$selected[$id] .= get_string("emptypage","wiki")."
"; } // Check for orphaned pages @@ -1136,50 +1136,50 @@ function wiki_admin_remove_list($listall="") { $orphanedpage=false; } - #echo "rc({$row['id']})==>($id): $check2
"; + #echo "rc({$row['id']})==>($id): $check2
"; } } /// Some more reasons for Deletion... if ($orphanedpage && $id!=EWIKI_PAGE_INDEX &&!($flags & EWIKI_DB_F_BINARY)) { - @$selected[$id] .= get_string("orphanedpage","wiki")."
"; + @$selected[$id] .= get_string("orphanedpage","wiki")."
"; } if ($flags & EWIKI_DB_F_DISABLED) { - @$selected[$id] .= get_string("disabledpage","wiki")."
"; + @$selected[$id] .= get_string("disabledpage","wiki")."
"; } if (($flags & 3) == 3) { - @$selected[$id] .= get_string("errorbinandtxt","wiki")."
"; + @$selected[$id] .= get_string("errorbinandtxt","wiki")."
"; } if (!($flags & 3)) { - @$selected[$id] .= get_string("errornotype","wiki")."
"; + @$selected[$id] .= get_string("errornotype","wiki")."
"; } if ($flags & EWIKI_DB_F_HTML) { - @$selected[$id] .= get_string("errorhtml","wiki")."
"; + @$selected[$id] .= get_string("errorhtml","wiki")."
"; } if (($flags & EWIKI_DB_F_READONLY) && !($flags & EWIKI_DB_F_BINARY)) { - @$selected[$id] .= get_string("readonly","wiki")."
"; + @$selected[$id] .= get_string("readonly","wiki")."
"; } if (($flags & EWIKI_DB_F_READONLY) && ($flags & EWIKI_DB_F_WRITEABLE)) { - @$selected[$id] .= get_string("errorroandwr","wiki")."
"; + @$selected[$id] .= get_string("errorroandwr","wiki")."
"; } if (strlen($page["content"]) >= 65536) { - @$selected[$id] .= get_string("errorsize","wiki")."
"; + @$selected[$id] .= get_string("errorsize","wiki")."
"; } if (strpos($page["refs"], "\n".get_string("deletemewikiword","wiki")."\n")!==false) { - @$selected[$id] .= get_string("deletemewikiwordfound","wiki",get_string("deletemewikiword","wiki"))."
"; + @$selected[$id] .= get_string("deletemewikiwordfound","wiki",get_string("deletemewikiword","wiki"))."
"; } } foreach ($selected as $id => $reason) { - $table_checkbox=''; + $table_checkbox=''; #-- link & id if (strpos($id, EWIKI_IDF_INTERNAL) === false) { @@ -1241,9 +1241,9 @@ function wiki_admin_strip_list($pagestostrip="",$version="",$err="") { } else { $versiondefault=$version[$i]; } - $table->data[]=array('', + $table->data[]=array('', ''.htmlentities($id).' / '.get_string("version","wiki").": ".$row["version"], - ''.$error); + ''.$error); } $i++; @@ -1312,7 +1312,7 @@ function wiki_admin_checklinks($pagetocheck) { preg_match_all('_(http.?://[^\s"\'<>#,;]+[^\s"\'<>#,;.])_', $content, $links); $badlinks = array(); if(!$links[1]) { - $ret = get_string("nolinksfound","wiki")."

"; + $ret = get_string("nolinksfound","wiki")."

"; } else { foreach ($links[1] as $href) { #print "[ $href ]"; @@ -1323,10 +1323,10 @@ function wiki_admin_checklinks($pagetocheck) { $d="OK"; } if (empty($d) || !strlen(trim($d)) || stristr("not found", $d) || stristr("error 404", $d)) { - $ret.="[".get_string("linkdead","wiki")."] $href
\n"; + $ret.="[".get_string("linkdead","wiki")."] $href
\n"; $badlinks[] = $href; } else { - $ret.="[".get_string("linkok","wiki")."] $href
\n"; + $ret.="[".get_string("linkok","wiki")."] $href
\n"; } } } @@ -1401,7 +1401,7 @@ function wiki_admin_revert($proceed, $authorfieldpattern, $changesfield, $howtoo ewiki_database("DELETE", $row); } } - $ret .= ")
"; + $ret .= ")
"; break; } } #-- for($ver) diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html index cdd42908fa..93db236aa5 100644 --- a/mod/wiki/mod.html +++ b/mod/wiki/mod.html @@ -71,7 +71,7 @@

- + @@ -176,7 +176,7 @@ } else { ?> - + initialcontent\"> "; + echo "initialcontent\" /> "; button_to_popup_window ("/mod/wiki/wikifiles.php?id=$course->id", "wikifiles", $strchooseafile, 500, 750, $strchooseafile); } @@ -206,14 +206,14 @@ - - - - - - - - - + + + + + + + + + diff --git a/mod/wiki/removepages.html b/mod/wiki/removepages.html index 2a74fc304a..ead02997b4 100644 --- a/mod/wiki/removepages.html +++ b/mod/wiki/removepages.html @@ -1,16 +1,16 @@
"; + print get_string("removenotice","wiki")."

"; ?>
- - - - - + + + + + listall); print_table($remove_table); @@ -18,15 +18,15 @@ data)) { - print get_string("nocandidatestoremove","wiki",get_string("listall","wiki"))."

"; + print get_string("nocandidatestoremove","wiki",get_string("listall","wiki"))."

"; } ?> listall) { - print ' '."\n"; + print ' '."\n"; } else { - print ' '."\n"; + print ' '."\n"; } ?> - "> + " /> \ No newline at end of file diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php index d2a683f397..85e3c1eb7e 100644 --- a/mod/wiki/restorelib.php +++ b/mod/wiki/restorelib.php @@ -55,7 +55,7 @@ $newid = insert_record ("wiki",$wiki); //Do some output - echo "
".get_string("modulename","wiki")." \"".$wiki->name."\"
"; + echo "
".get_string("modulename","wiki")." \"".$wiki->name."\"
"; backup_flush(300); if ($newid) { @@ -124,7 +124,7 @@ if (($i+1) % 50 == 0) { echo "."; if (($i+1) % 1000 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -190,7 +190,7 @@ //The structure is equal to the db, so insert the wiki_comments insert_record ("wiki_pages",$page, false,"pagename"); #print "
"; print_r($page); print "
"; - print ($r?"TRUE":"FALSE")."
\n"; + print ($r?"TRUE":"FALSE")."
\n"; #$newid = insert_record ("wiki_pages",$page); #if($newid) { # $newid = backup_todb($pag_info['#']['PAGENAME']['0']['#']."_".$pag_info['#']['VERSION']['0']['#']."_".$new_entry_id); @@ -199,7 +199,7 @@ if (($i+1) % 50 == 0) { echo "."; if (($i+1) % 1000 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } diff --git a/mod/wiki/revertpages.html b/mod/wiki/revertpages.html index 734178fd1b..66785fbc9e 100644 --- a/mod/wiki/revertpages.html +++ b/mod/wiki/revertpages.html @@ -9,11 +9,11 @@ if (!isset($form->changesfield)) { ?> - - - - - + + + + + remark) {
:
- + authorfieldpattern)) { formerr($err->authorfieldpattern); } @@ -35,7 +35,7 @@ if($err->remark) {
:
- + changesfield)) { formerr($err->changesfield); } ?> @@ -53,10 +53,10 @@ if($err->remark) {
:
- + deleteversions)) { formerr($err->deleteversions); } ?> - "> + " /> \ No newline at end of file diff --git a/mod/wiki/setpageflags.html b/mod/wiki/setpageflags.html index 5dae71542e..0ed652d97d 100644 --- a/mod/wiki/setpageflags.html +++ b/mod/wiki/setpageflags.html @@ -3,16 +3,16 @@ ?> - - - - - + + + + + -
+
- "> + " /> \ No newline at end of file diff --git a/mod/wiki/strippages.html b/mod/wiki/strippages.html index 7a13cd7056..a6b7e06932 100644 --- a/mod/wiki/strippages.html +++ b/mod/wiki/strippages.html @@ -3,11 +3,11 @@ ?> - - - - - + + + + + pagestostrip, $form->version, $err); print_table($strip_table); @@ -15,8 +15,8 @@ data)) { - print get_string("nothingtostrip","wiki")."

"; + print get_string("nothingtostrip","wiki")."

"; } ?> - "> + " /> \ No newline at end of file diff --git a/mod/wiki/test.php b/mod/wiki/test.php index 0560d66d14..6dc9c0432a 100644 --- a/mod/wiki/test.php +++ b/mod/wiki/test.php @@ -3,7 +3,7 @@ require_once("$CFG->dirroot/course/lib.php"); // For side-blocks require_once('wiki.class.php'); - echo "Test Harness
"; + echo "Test Harness
"; $wiki = new cWiki(9); diff --git a/mod/wiki/view.php b/mod/wiki/view.php index d1e9e0351e..5890f138aa 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -294,9 +294,9 @@ if($ewiki_title==$wiki_entry->pagename && !empty($wiki->summary)) { if (trim(strip_tags($wiki->summary))) { - print "
"; + print "
"; print_simple_box(format_text($wiki->summary, FORMAT_MOODLE), "center"); - print "
"; + print "
"; } } diff --git a/mod/wiki/wikifiles.php b/mod/wiki/wikifiles.php index 5fd2582cfe..fe45d214fc 100755 --- a/mod/wiki/wikifiles.php +++ b/mod/wiki/wikifiles.php @@ -150,20 +150,20 @@ echo "
$struploadafile ($strmaxsize) --> $wdir"; echo "
"; echo ""; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; - echo " "; + echo " "; echo ""; echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo "
"; } @@ -250,19 +250,19 @@ echo "
$strrenamefileto:"; echo "
"; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo "
"; } @@ -288,18 +288,18 @@ echo "
$strcreatefolder:"; echo "
"; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo "
"; } @@ -330,20 +330,20 @@ echo "
"; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; print_textarea($usehtmleditor, 25, 80, 680, 400, "text", $contents); echo "
"; - echo " "; + echo " "; echo ""; echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo "
"; @@ -393,18 +393,18 @@ echo "
".get_string("whattocallzip"); echo "
"; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo "
"; } else { @@ -467,10 +467,10 @@ } echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo ""; } else { @@ -513,11 +513,11 @@ } echo ""; } - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; echo ""; echo "
"; } else { @@ -629,7 +629,7 @@ function printfilelist($filelist) { foreach ($filelist as $file) { if (is_dir($basedir.$file)) { - echo "pixpath/f/folder.gif\" height=16 width=16> $file
"; + echo "pixpath/f/folder.gif\" height=16 width=16> $file
"; $subfilelist = array(); $currdir = opendir($basedir.$file); while ($subfile = readdir($currdir)) { @@ -641,7 +641,7 @@ function printfilelist($filelist) { } else { $icon = mimeinfo("icon", $file); - echo "pixpath/f/$icon\" height=16 width=16> $file
"; + echo "pixpath/f/$icon\" height=16 width=16> $file
"; } } } @@ -725,7 +725,7 @@ function displaydir ($wdir) { echo ""; - print_cell("center", ""); + print_cell("center", ""); print_cell("left", "pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"> ".htmlspecialchars($dir).""); print_cell("right", "-"); print_cell("right", $filedate); @@ -762,7 +762,7 @@ function displaydir ($wdir) { echo ""; - print_cell("center", ""); + print_cell("center", ""); echo ""; link_to_popup_window ($ffurl, "display", @@ -799,8 +799,8 @@ function displaydir ($wdir) { echo ""; echo ""; echo ""; echo "
"; - echo ""; - echo " "; + echo ""; + echo " "; $options = array ( "move" => "$strmovetoanotherfolder", "delete" => "$strdeletecompletely", @@ -814,26 +814,26 @@ function displaydir ($wdir) { echo " "; if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) { echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; } echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo " "; echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; echo "
"; diff --git a/mod/workshop/Overview.html b/mod/workshop/Overview.html index 2835609af6..488d2771c4 100644 --- a/mod/workshop/Overview.html +++ b/mod/workshop/Overview.html @@ -7,25 +7,25 @@
Another Assignment Module
-
+

"Assessment is the most powerful lever teachers have to influence the way students respond to courses and -behave as learners"
+behave as learners"

-
+

from Graham Gibbs, "Using Assessment Strategically to Change the Way Students Learn" in "Asessment Matter in Higher Education, edited by Sally Brown and -Angela Glasner, OU Press, 1999
+Angela Glasner, OU Press, 1999

-
+

Overview
This new module enables the teacher to set up a controlled assignment which encourages students to become more critical of both their own work and that of others. In its standard form, the module usually begins with a preparatory phase where the teacher sets up the assessment criteria. These will depend on which assessment strategy the teacher decides to -use for the assignment. There are four separate strategies:
+use for the assignment. There are four separate strategies:

No grading: In this type of assignment the teacher is not interested in quantative assessment from the students at all. The @@ -59,12 +59,12 @@ for each criterion.
Next the teacher submits a small number (probably between 5 and 10) example pieces of work. These most likely have been gleaned from previous cohorts and should probably include both good and poor attempts -at the assignment.
-
+at the assignment.
+
Lastly the teacher assesses these examples using the "grading form" set up for the asssignment. The teacher's assessments are there to guide the -students when they start the assignment.
-
+students when they start the assignment.
+
With these three sets of items in place, the assessment elements (and possibly the associated grade table), the example assignments and the specimen assessments, the assignment can be opened up to the students. @@ -76,15 +76,15 @@ re-assess one or more of the example assessments. This should be easy to do as once an example assignment is assessed the student is able to view the teacher's "specimen" assessments. This loop is basically there to check that the weaker students are aware of the specimen assessments and -have looked at them.
-
+have looked at them.
+
At the end of this initial stage the students should have a fair idea of what the assignment is about and how it is being assessed. They are now allowed to submit their own work. This is not a fixed milestone, each student will reach this second stage independently. With all the inital assessments graded the teacher can sit back and let the module -run until the deadline date.
-
+run until the deadline date.
+
The module can be set up to allow single submission or multiple submissions. Depending on this setting, the student' first submission is either their first draft or their only attempt.When the students have @@ -94,11 +94,11 @@ students. However, they must do at least one assessment before they are shown the peer assessments. When the assignment allows resubmission the student may, in the light of the feedback, revise their work and submit a new copy for peer assessment. The peer assessment of student -submissions continues until the deadline date is reached.
-
+submissions continues until the deadline date is reached.
+
The teacher now has several choices. The module allows a flexible approach to calculating the final grade for the students. In fact, the -final grade can be a teacher-defined combination of:
+final grade can be a teacher-defined combination of:

The teacher's grade of the (final) submission

The average peer grade of the (final) submission
@@ -111,9 +111,9 @@ graded by the teacher. The module can assess the quality of these assignments by internal comparison. This is probably just as well as the number of assessments generated at that phase could be quite large even for reasonably sized classes. The final phase of the module is the -release of the final grades to the students.
-
-Thus the module normally runs through four phases:
+release of the final grades to the students.
+
+Thus the module normally runs through four phases:

Set up

Student assessment of the example assignments, submission of work @@ -121,22 +121,22 @@ and peer assessment

Calculation of final grades

Release of final grades

-And there's a single deadline occurring between phases 2 and 3.
-
+And there's a single deadline occurring between phases 2 and 3.
+

Variants
That describes the "standard" assignment which this module supports. The module also lends itself to a few other types of assignment. For example, a "case study" assignment can be handled where the teacher sets up a number of scenarios for the students to comment on. Here there are no student submissions the teacher simply grades the students -responses to each scenario and uses those to calculate the final grades.
-
+responses to each scenario and uses those to calculate the final grades.
+
A second example using the module in an abbrieviated way is as a simple peer assessment assignment. Here the teacher sets up the assessment elements but does not submit any example assignments and the students go straight in to the peer assessment phase, possibly going where no class -has boldly gone before!
-
+has boldly gone before!
+
For certain assignments the teacher may decide that the example assignments would simply lead the students into doing a cut-and-paste exercise to produce their assignments. Here the initial assessment phase @@ -146,14 +146,14 @@ this way the students are shown what is expected of them and how it is being assessed but "the cat is still in the bag" so to speak. Careful monitoring of the assignment would be necessary else many students, not reading the instructions, would reproduce the examples rather then the -required assignment.
-
+required assignment.
+
The module can also be set up to ask the students to asssess their own work. That is instead of peer assessment the assignment becomes one involving self assessment. Here it is likely that the teacher would grade the (self) assessments make in the second half of phase 2 and -include these grades in the final grades.
-
+include these grades in the final grades.
+

Conclusion
Thus the module is quite flexible while still being relatively easy to set up and run. The module has been keep purposely simple. For example @@ -164,10 +164,10 @@ be used. Other technical restrictions are that the submitted assignments are limited to a single file, that is although multiple submissions are allowed each submission can only be just one file. The files themselves are limited to a prediefined size and the module does not support links -to external pieces of work.
-
-Ray Kingdon
-April 2003
-
+to external pieces of work.
+
+Ray Kingdon
+April 2003
+
diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php index 7caff6ef31..0f60d47d50 100644 --- a/mod/workshop/assessments.php +++ b/mod/workshop/assessments.php @@ -80,25 +80,30 @@ } ?>
- - - + + + \n"; - echo " \n"; - echo " \n"; + + echo " \n"; + + echo "

". get_string("comment", "workshop").":
\n"; + echo "
". get_string("comment", "workshop").":
\n"; + echo " \n"; - echo "\n"; + echo "\n"; + echo "
\n"; - echo "\n"; + echo "\n"; echo "
\n"; echo "
".get_string("assessment", "workshop"). "\n"; workshop_print_assessment($workshop, $assessment); - } + } + /******************* admin confirm delete ************************************/ @@ -182,7 +187,8 @@ add_to_log($course->id, "workshop", "agree", "assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id", "$assessment->id"); print_continue("view.php?id=$cm->id"); - } + } + /*************** Assess submission (by teacher or student) ***************************/ @@ -250,9 +256,9 @@ } ?>
- - - + + + \n"; echo "

\n"; - echo "\n"; + echo "\n"; echo "
\n"; workshop_print_assessment($workshop, $assessment); } @@ -288,8 +294,8 @@ print_heading_with_help(get_string("editingassessmentelements", "workshop"), "elements", "workshop"); ?>
- - + +

- "> - "> + " /> + " />

- - - - + + + +

".get_string("gradeforstudentsassessment", "workshop")." \n"; choose_from_menu($num, "gradinggrade", $assessment->gradinggrade, ""); echo "
\n"; - echo "\n"; + echo "\n"; echo "
\n"; } diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index b09be734a1..df2a628150 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -1112,7 +1112,7 @@ function workshop_print_recent_mod_activity($activity, $course, $detail=false) { echo "$closeformat"; - echo "
"; + echo "
"; echo "wwwroot/user/view.php?id=" . $activity->user->userid . "&course=" . "$course\">" . $activity->user->fullname . ""; echo " - " . userdate($activity->timestamp) . ""; diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php index e417d532c7..bfdeadfbd8 100644 --- a/mod/workshop/locallib.php +++ b/mod/workshop/locallib.php @@ -1828,10 +1828,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges // FORM is needed for Mozilla browsers, else radio bttons are not checked ?>
- - - - + + + + \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } } echo " $SCALE->end\n"; @@ -2015,10 +2015,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges } } if ($checked) { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } } echo " $SCALE->end\n"; @@ -2119,10 +2119,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges echo "\n"; echo " \n"; if ($selection == $i) { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } echo "\n"; } @@ -2172,9 +2172,9 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges } echo "\n"; if ($selection == $j) { - echo " \n"; + echo " \n"; }else { - echo " \n"; + echo " \n"; } echo "\n"; } @@ -2259,16 +2259,16 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges echo "

$iplus1 ".text_to_html($elements[$i]->description)." {$elements[$i]->maxscore}
".text_to_html($rubrics[$j]->description)."
\n"; if ($assessment) { if ($allowchanges) { - echo "\n"; + echo "\n"; } // ...if user is author, assessment not agreed, there's no comments, the showcommentlinks flag is set and // it's not self assessment then show some buttons! if (($submission->userid == $USER->id) and !$assessment->timeagreed and !$comments and $showcommentlinks and $submission->userid != $assessment->userid) { echo "\n"; + onclick=\"document.assessmentform.action.value='agreeassessment';document.assessmentform.submit();\" />\n"; echo "\n"; + onclick=\"document.assessmentform.action.value='addcomment';document.assessmentform.submit();\" />\n"; } } echo ""; @@ -2288,7 +2288,7 @@ function workshop_print_assessments_by_user_for_admin($workshop, $user) { echo "
".get_string("assessmentby", "workshop", fullname($user))."
\n"; workshop_print_assessment($workshop, $assessment); echo "
id&aid=$assessment->id\">". - get_string("delete", "workshop")."
\n"; + get_string("delete", "workshop")."
\n"; } } } @@ -2309,7 +2309,7 @@ function workshop_print_assessments_for_admin($workshop, $submission) { echo "
".get_string("assessmentby", "workshop", fullname($user))."
\n"; workshop_print_assessment($workshop, $assessment); echo "
id&aid=$assessment->id\">". - get_string("delete", "workshop")."
\n"; + get_string("delete", "workshop")."
\n"; } } } @@ -2687,11 +2687,11 @@ function workshop_print_upload_form($workshop) { echo "
"; echo ""; - echo " maxbytes\">"; - echo " id\">"; - echo "".get_string("title", "workshop").":

\n"; - echo " "; - echo " "; + echo " maxbytes\" />"; + echo " id\" />"; + echo "".get_string("title", "workshop").":

\n"; + echo " "; + echo " "; echo ""; echo "
"; } diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html index b4cfac8bc0..64d2f1c445 100644 --- a/mod/workshop/mod.html +++ b/mod/workshop/mod.html @@ -68,7 +68,7 @@
:
- + @@ -331,15 +331,15 @@
- - - - - - - -"> -"> + + + + + + + +" /> +" />

diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php index c1403c5906..2f5e34d6fc 100644 --- a/mod/workshop/restorelib.php +++ b/mod/workshop/restorelib.php @@ -81,7 +81,7 @@ $newid = insert_record ("workshop",$workshop); //Do some output - echo "
".get_string("modulename","workshop")." \"".$workshop->name."\"
"; + echo "
".get_string("modulename","workshop")." \"".$workshop->name."\"
"; backup_flush(300); if ($newid) { @@ -141,7 +141,7 @@ if (($i+1) % 10 == 0) { echo "."; if (($i+1) % 200 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -189,7 +189,7 @@ if (($i+1) % 10 == 0) { echo "."; if (($i+1) % 200 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -250,7 +250,7 @@ if (($i+1) % 50 == 0) { echo "."; if (($i+1) % 1000 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -324,7 +324,7 @@ if (($i+1) % 50 == 0) { echo "."; if (($i+1) % 1000 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -393,7 +393,7 @@ if (($i+1) % 50 == 0) { echo "."; if (($i+1) % 1000 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -439,7 +439,7 @@ if (($i+1) % 50 == 0) { echo "."; if (($i+1) % 1000 == 0) { - echo "
"; + echo "
"; } backup_flush(300); } @@ -683,7 +683,7 @@ } break; default: - echo "action (".$log->module."-".$log->action.") unknow. Not restored
"; //Debug + echo "action (".$log->module."-".$log->action.") unknow. Not restored
"; //Debug break; } diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php index 4944a9b06e..d1e43a8be1 100644 --- a/mod/workshop/submissions.php +++ b/mod/workshop/submissions.php @@ -67,9 +67,9 @@ print_heading(get_string("amendtitle", "workshop")); ?>
- - - + + + \n"; echo " \n"; echo "

". get_string("title", "workshop").":
\n"; - echo " title\">\n"; + echo " title\" />\n"; echo "
\n"; - echo "\n"; + echo "\n"; echo "
\n"; } -- 2.39.5

diff --git a/mod/glossary/comment.html b/mod/glossary/comment.html index 6025e9dc7c..cdfaae1df4 100644 --- a/mod/glossary/comment.html +++ b/mod/glossary/comment.html @@ -32,7 +32,7 @@ '; + echo ''; } else { if (!isset($form->format)) { $form->format = $defaultformat; @@ -48,16 +48,16 @@ id)) { - echo "id\">"; + echo "id\" />"; } ?> - - - + + + - "> - "> + " /> + " />
glossary_entbypage:	- +	@@ -261,7 +261,7 @@
- ">

:
:	id,'name ASC'); - echo ""; echo ""; if ( $categories ) { @@ -60,9 +60,9 @@ if (isset($errors)) {	usedynalink ) { - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; } else { echo ''; @@ -71,7 +71,7 @@ if (isset($errors)) { } else { $selected = ""; } - echo ' '; + echo ' '; echo ''; print_string("entryusedynalink","glossary"); echo ''; @@ -83,7 +83,7 @@ if (isset($errors)) { } else { $selected = ""; } - echo ' '; + echo ' '; echo ''; print_string("casesensitive","glossary"); echo ''; @@ -96,7 +96,7 @@ if (isset($errors)) { } else { $selected = ""; } - echo ' '; + echo ' '; echo ''; print_string("fullmatch","glossary"); echo ''; @@ -143,7 +143,7 @@ if (isset($errors)) { '; + echo ''; } else { if (!isset($newentry->format)) { $newentry->format = $defaultformat; @@ -158,8 +158,8 @@ if (isset($errors)) {
: ()	- - + + maxbytes, $course->maxbytes))); @@ -170,21 +170,21 @@ if (isset($errors)) {	id)) { - echo "id\">"; + echo "id\" />"; } ?> - - - + + + - - - + + + - "> - "> + " /> + " />
:	- +
- - - - - - "> - " onclick="javascript:history.go(-1);"> + + + + + + " /> + " onclick="javascript:history.go(-1);" />

$entry->concept

$entry->concept

' . ewiki_t("ATTACHMENTS") . '

WikiSetupWizard

Another Assignment Module

Overview

Variants

Conclusion

"; echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; - echo " "; + echo " "; echo ""; echo "	"; echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo " "; echo "

"; echo ""; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "
"; - echo " "; + echo " "; echo ""; echo "	"; echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo " "; echo "

". get_string("comment", "workshop").":	\n"; + echo "
". get_string("comment", "workshop").":	\n"; + echo " \n"; - echo "\n"; + echo "\n"; + echo "

$iplus1	".text_to_html($elements[$i]->description)."					{$elements[$i]->maxscore}
				".text_to_html($rubrics[$j]->description)."