L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some $ME are now out!

Browse Source 
Merged from MOODLE_14_STABLE
This commit is contained in:
stronk7
2005-02-27 02:13:18 +00:00
parent 4a1bf86fae
commit d0b95287c5
6 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/backup_check.html
+1 -1
View File
@@ -87,7 +87,7 @@
}
?>
<form name="form" method="post" action="<?php echo $ME ?>">
<form name="form" method="post" action="backup.php">
<table cellpadding="5">
<?php
backup/backup_form.html
+1 -1
View File
@@ -87,7 +87,7 @@
?>
<form name="form" method="post" action="<?php echo $ME ?>">
<form name="form" method="post" action="backup.php">
<table cellpadding="5">
<?php
if ($allmods = get_records("modules") ) {
backup/restore_form.html
+1 -1
View File
@@ -121,7 +121,7 @@ function selectItemInMenuByName(formId, menuName, selectIndex ) {
-->
</script>
<form name="form1" id="form1" method="post" action="<?php echo $ME ?>">
<form name="form1" id="form1" method="post" action="restore.php">
<table cellpadding="5">
<?php
mod/wiki/lib.php
+13 -15
View File
@@ -424,7 +424,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
/// Returns a list of other wikis to display, depending on the type, group and user.
/// Returns the key containing the currently selected entry as well.
global $CFG, $ME, $id;
global $CFG, $id;
$wikis = false;
@@ -458,7 +458,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$pagename = $defpagename;
}
$key = $ME.'?id='.$id.'&userid='.$student->id.'&page='.$pagename;
$key = 'view.php?id='.$id.'&userid='.$student->id.'&page='.$pagename;
$wikis[$key] = fullname($student).':'.$pagename;
}
}
@@ -476,7 +476,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$pagename = $defpagename;
}
$key = $ME.'?id='.$id.'&userid='.$student->id.'&page='.$pagename;
$key = 'view.php?id='.$id.'&userid='.$student->id.'&page='.$pagename;
$wikis[$key] = fullname($student).':'.$pagename;
}
}
@@ -493,7 +493,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
else {
$pagename = $defpagename;
}
$key = $ME.'?id='.$id.'&userid='.$student->id.'&page='.$pagename;
$key = 'view.php?id='.$id.'&userid='.$student->id.'&page='.$pagename;
$wikis[$key] = fullname($student).':'.$pagename;
}
}
@@ -505,7 +505,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$wiki_entries = get_records_sql($sql);
$wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
foreach ($wiki_entries as $wiki_entry) {
$key = $ME.'?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
$key = 'view.php?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
$wikis[$key] = fullname($wiki_entry).':'.$wiki_entry->pagename;
if ($currentid == $wiki_entry->id) {
$wikis['selected'] = $key;
@@ -537,7 +537,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
foreach ($wiki_entries as $wiki_entry) {
if (($viewall === true) or ismember($viewall, $wiki_entry->userid)) {
$key = $ME.'?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
$key = 'view.php?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
$wikis[$key] = fullname($wiki_entry).':'.$wiki_entry->pagename;
if ($currentid == $wiki_entry->id) {
$wikis['selected'] = $key;
@@ -568,7 +568,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$pagename = $defpagename;
}
$key = $ME.'?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
$key = 'view.php?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
$wikis[$key] = $group->name.':'.$pagename;
}
}
@@ -582,7 +582,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$wiki_entries = get_records_sql($sql);
$wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
foreach ($wiki_entries as $wiki_entry) {
$key = $ME.'?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
$key = 'view.php?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
$wikis[$key] = $wiki_entry->gname.':'.$wiki_entry->pagename;
if ($currentid == $wiki_entry->id) {
$wikis['selected'] = $key;
@@ -608,7 +608,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$pagename = $defpagename;
}
$key = $ME.'?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
$key = 'view.php?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
$wikis[$key] = $group->name.':'.$pagename;
}
}
@@ -622,7 +622,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$wiki_entries = get_records_sql($sql);
$wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
foreach ($wiki_entries as $wiki_entry) {
$key = $ME.'?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
$key = 'view.php?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
$wikis[$key] = $wiki_entry->gname.':'.$wiki_entry->pagename;
if ($currentid == $wiki_entry->id) {
$wikis['selected'] = $key;
@@ -651,7 +651,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
$wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
foreach ($wiki_entries as $wiki_entry) {
if (($viewall === true) or $viewall == $wiki_entry->groupid) {
$key = $ME.'?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
$key = 'view.php??id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
$wikis[$key] = $wiki_entry->gname.':'.$wiki_entry->pagename;
if ($currentid == $wiki_entry->id) {
$wikis['selected'] = $key;
@@ -1008,10 +1008,8 @@ function wiki_print_page_actions($cmid, $specialpages, $page, $action, $binary=f
function wiki_print_administration_actions($wiki, $cmid, $userid, $groupid, $page, $noeditor, $course) {
/// Displays actions which can be performed on the page
global $ME;
/// Create the URL
/// Create the URL
$ewscript = 'admin.php?id='.$cmid;
if (isset($userid) && $userid!=0) $ewscript .= '&amp;userid='.$userid;
if (isset($groupid) && $groupid!=0) $ewscript .= '&amp;groupid='.$groupid;
mod/wiki/mod.html
+3 -3
View File
@@ -65,7 +65,7 @@
}
?>
<form name="form" method="post" action="<?php echo $ME ?>">
<form name="form" method="post" action="mod.php">
<center>
<table cellpadding="5">
<tr valign="top">
@@ -92,8 +92,8 @@
else {
choose_from_menu($WIKI_TYPES, 'wtype', $form->wtype, "");
}
helpbutton('wikitype', get_string('wikitype', 'wiki'), 'wiki');
?>
<?php helpbutton('wikitype', get_string('wikitype', 'wiki'), 'wiki'); ?>
</td>
</tr>
<tr valign="top">
@@ -112,8 +112,8 @@
<?php
$htmlmodes=array( "0" => get_string("nohtml","wiki") , "1" => get_string("safehtml","wiki"), "2" => get_string("htmlonly","wiki"));
choose_from_menu($htmlmodes, "htmlmode", $form->htmlmode, "");
helpbutton('htmlmode', get_string('htmlmode', 'wiki'), 'wiki');
?>
<?php helpbutton('htmlmode', get_string('htmlmode', 'wiki'), 'wiki'); ?>
</td>
</tr>
<tr valign="top">
mod/wiki/view.php
+1 -1
View File
@@ -95,7 +95,7 @@
/// Build the ewsiki script constant
/// ewbase will also be needed by EWIKI_SCRIPT_BINARY
$ewbase = $ME.'?id='.$moodleID;
$ewbase = 'view.php?id='.$moodleID;
if (isset($userid) && $userid!=0) $ewbase .= '&amp;userid='.$userid;
if (isset($groupid) && $groupid!=0) $ewbase .= '&amp;groupid='.$groupid;
$ewscript = $ewbase.'&amp;page=';