- | : |
-
+ | : |
+
|
-
+
|
- | : |
-
+ | : |
+
|
-
+
|
- | : |
-
+ | : |
+
|
-
+
|
diff --git a/admin/filters.php b/admin/filters.php
index 0045ff700e4af..75258c6b05613 100644
--- a/admin/filters.php
+++ b/admin/filters.php
@@ -84,7 +84,7 @@
/// If data submitted, then process and store.
if (!empty($options)) {
- if (($config = data_submitted()) && confirm_sesskey()) {
+ if (($config = data_submitted()) && confirm_sesskey()) {
unset($config->options);
unset($config->sesskey);
foreach ($config as $name => $value) {
diff --git a/admin/phpinfo.php b/admin/phpinfo.php
index f2501da768cd3..b8265bbaa1c29 100644
--- a/admin/phpinfo.php
+++ b/admin/phpinfo.php
@@ -13,7 +13,7 @@
$stradministration = get_string("administration");
$site = get_site();
- print_header("$site->shortname: phpinfo", "$site->fullname",
+ print_header("$site->shortname: phpinfo", "$site->fullname",
"framename\" href=\"index.php\">$stradministration -> PHP info");
exit;
}
diff --git a/admin/process_email.php b/admin/process_email.php
index e148c68448bbb..66d5f855536f1 100755
--- a/admin/process_email.php
+++ b/admin/process_email.php
@@ -45,7 +45,7 @@
$hash = substr($address,-16);
if (substr(md5($prefix.$mod.$modargs.$CFG->siteidentifier),0,16) != $hash) {
- die("HASH DIDN'T MATCH!\n");
+ die("HASH DIDN'T MATCH!\n");
}
list(,$modid) = unpack('C',base64_decode($mod.'=='));
@@ -59,7 +59,7 @@
$function = $modname.'_process_email';
if (!function_exists($function)) {
- die();
+ die();
}
$fd = fopen('php://stdin','r');
if (!$fd) {
@@ -76,4 +76,4 @@
-?>
\ No newline at end of file
+?>
diff --git a/admin/register.php b/admin/register.php
index a4ea25bf54692..673fab5869169 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -36,7 +36,7 @@
$strregistration = get_string("registration");
$strregistrationinfo = get_string("registrationinfo");
- print_header("$site->shortname: $strregistration", "$site->fullname",
+ print_header("$site->shortname: $strregistration", "$site->fullname",
"admin/index.php\">$stradministration -> $strregistration");
print_heading($strregistration);
diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index 3fdd3ef4440f3..9ca06e91e2544 100755
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -102,11 +102,11 @@
"course3" => 1,
"course4" => 1,
"course5" => 1,
- "group1" => 1,
- "group2" => 1,
- "group3" => 1,
- "group4" => 1,
- "group5" =>1);
+ "group1" => 1,
+ "group2" => 1,
+ "group3" => 1,
+ "group4" => 1,
+ "group5" =>1);
// --- get header (field names) ---
$header = split($csv_delimiter, fgets($fp,1024));
@@ -209,20 +209,20 @@
notify(get_string('unknowncourse', 'error', $addcourse[$i]));
}
}
- for ($i=0; $i<5; $i++) {
+ for ($i=0; $i<5; $i++) {
$groupid[$i] = 0;
if ($addgroup[$i]) {
- if (!$courseid[$i]) {
- notify(get_string('coursegroupunknown','error',$addgroup[$i]));
- } else {
- if ($group = get_record("groups","courseid",$courseid[$i],"name",$addgroup[$i])) {
- $groupid[$i] = $group->id;
- } else {
- notify(get_string('groupunknown','error',$addgroup[$i]));
- }
- }
- }
- }
+ if (!$courseid[$i]) {
+ notify(get_string('coursegroupunknown','error',$addgroup[$i]));
+ } else {
+ if ($group = get_record("groups","courseid",$courseid[$i],"name",$addgroup[$i])) {
+ $groupid[$i] = $group->id;
+ } else {
+ notify(get_string('groupunknown','error',$addgroup[$i]));
+ }
+ }
+ }
+ }
for ($i=0; $i<5; $i++) {
if ($courseid[$i]) {
if (enrol_student($user->id, $courseid[$i])) {
@@ -233,26 +233,26 @@
}
}
for ($i=0; $i<5; $i++) {
- if ($courseid[$i] && $groupid[$i]) {
- if (record_exists("user_students","userid",$user->id,"course",$courseid[$i])) {
- $usergroup = user_group($courseid[$i],$user->id);
+ if ($courseid[$i] && $groupid[$i]) {
+ if (record_exists("user_students","userid",$user->id,"course",$courseid[$i])) {
+ $usergroup = user_group($courseid[$i],$user->id);
if ($usergroup) {
- notify('-->' . get_string('groupalready','error',$usergroup->name));
- } else {
- $group_member->groupid = $groupid[$i];
- $group_member->userid = $user->id;
- $group_member->timeadded = time();
- if (insert_record("groups_members",$group_member)) {
- notify('-->' . get_string('addedtogroup','',$addgroup[$i]));
- } else {
- notify('-->' . get_string('addedtogroupnot','',$addgroup[$i]));
- }
- }
- } else {
- notify('-->' . get_string('addedtogroupnotenrolled','',$addgroup[$i]));
- }
- }
- }
+ notify('-->' . get_string('groupalready','error',$usergroup->name));
+ } else {
+ $group_member->groupid = $groupid[$i];
+ $group_member->userid = $user->id;
+ $group_member->timeadded = time();
+ if (insert_record("groups_members",$group_member)) {
+ notify('-->' . get_string('addedtogroup','',$addgroup[$i]));
+ } else {
+ notify('-->' . get_string('addedtogroupnot','',$addgroup[$i]));
+ }
+ }
+ } else {
+ notify('-->' . get_string('addedtogroupnotenrolled','',$addgroup[$i]));
+ }
+ }
+ }
unset ($user);
}
diff --git a/auth/db/config.html b/auth/db/config.html
index b89ce55664dba..888fd7448400a 100644
--- a/auth/db/config.html
+++ b/auth/db/config.html
@@ -28,19 +28,19 @@
}
?>
- | auth_dbhost: |
-
+ | auth_dbhost: |
+
-
- |
+
+
|
- | auth_dbtype: |
-
+ | auth_dbtype: |
+
|
- | auth_dbname: |
-
+ | auth_dbname: |
+
|
@@ -66,8 +66,8 @@
- | auth_dbuser: |
-
+ | auth_dbuser: |
+
|
@@ -77,8 +77,8 @@
- | auth_dbpass: |
-
+ | auth_dbpass: |
+
|
@@ -88,8 +88,8 @@
- | auth_dbtable: |
-
+ | auth_dbtable: |
+
|
@@ -99,8 +99,8 @@
- | auth_dbfielduser: |
-
+ | auth_dbfielduser: |
+
|
@@ -110,8 +110,8 @@
- | auth_dbfieldpass: |
-
+ | auth_dbfieldpass: |
+
|
@@ -121,8 +121,8 @@
- | auth_dbpasstype: |
-
+ | auth_dbpasstype: |
+
- | : |
-
+ | : |
+
|
@@ -147,86 +147,86 @@
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | 1: |
-
+ | 1: |
+
|
- | 2: |
-
+ | 2: |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
- | : |
-
+ | : |
+
|
diff --git a/auth/fc/lib.php b/auth/fc/lib.php
index 9cf94a61d7a06..4c2bd2d72bf87 100644
--- a/auth/fc/lib.php
+++ b/auth/fc/lib.php
@@ -91,7 +91,7 @@ function auth_get_userinfo($username){
$userinfo['email'] = strtok($fpp->getUserInfo($username,"1252"),',');
$userinfo['phone1'] = $fpp->getUserInfo($username,"1206");
$userinfo['phone2'] = $fpp->getUserInfo($username,"1207");
- $userinfo['description'] = $fpp->getResume($username);
+ $userinfo['description'] = $fpp->getResume($username);
}
}
@@ -151,4 +151,4 @@ function auth_iscreator($username=0) {
return false;
}
-
\ No newline at end of file
+
diff --git a/auth/imap/config.html b/auth/imap/config.html
index 9e7389fce8f40..5766b13299213 100644
--- a/auth/imap/config.html
+++ b/auth/imap/config.html
@@ -10,11 +10,11 @@
}
?>
|
- | auth_imaphost: |
-
+ | auth_imaphost: |
+
-
- |
+
+
@@ -22,8 +22,8 @@
|
- | auth_imaptype: |
-
+ | auth_imaptype: |
+
|
- | auth_imapport: |
-
+ | auth_imapport: |
+
|
@@ -48,8 +48,8 @@
- | : |
-
+ | : |
+
|
diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 6ace00db39b15..73847c68ab9f3 100644
--- a/auth/ldap/lib.php
+++ b/auth/ldap/lib.php
@@ -186,7 +186,7 @@ function auth_user_exists ($username) {
* @param mixed $plainpass Plaintext password
*/
function auth_user_create ($userobject,$plainpass) {
- global $CFG;
+ global $CFG;
$ldapconnection = auth_ldap_connect();
$attrmap = auth_ldap_attributes();
@@ -701,7 +701,7 @@ function auth_ldap_bulk_insert($users){
* @return boolen result
*/
function auth_user_activate ($username) {
- global $CFG;
+ global $CFG;
$ldapconnection = auth_ldap_connect();
@@ -726,7 +726,7 @@ function auth_user_activate ($username) {
* @return boolean result
*/
function auth_user_disable ($username) {
- global $CFG;
+ global $CFG;
$ldapconnection = auth_ldap_connect();
@@ -1310,7 +1310,7 @@ function auth_ldap_find_userdn ($ldapconnection, $username){
$ldap_contexts = explode(";",$CFG->ldap_contexts);
if (!empty($CFG->ldap_create_context)){
- array_push($ldap_contexts, $CFG->ldap_create_context);
+ array_push($ldap_contexts, $CFG->ldap_create_context);
}
foreach ($ldap_contexts as $context) {
@@ -1348,7 +1348,7 @@ function auth_ldap_find_userdn ($ldapconnection, $username){
function auth_ldap_attributes (){
- global $CFG;
+ global $CFG;
$config = (array)$CFG;
$fields = array("firstname", "lastname", "email", "phone1", "phone2",
@@ -1365,7 +1365,7 @@ function auth_ldap_attributes (){
}
}
$moodleattributes['username']=$config["ldap_user_attribute"];
- return $moodleattributes;
+ return $moodleattributes;
}
/**
diff --git a/auth/manual/config.html b/auth/manual/config.html
index 2febb35297c29..111a2494b0125 100644
--- a/auth/manual/config.html
+++ b/auth/manual/config.html
@@ -1,6 +1,6 @@
|
- | : |
-
+ | : |
+
|
diff --git a/auth/nntp/config.html b/auth/nntp/config.html
index 05682fe4d56db..8fcf207e15faf 100644
--- a/auth/nntp/config.html
+++ b/auth/nntp/config.html
@@ -8,11 +8,11 @@
?>
|
- | auth_nntphost: |
-
+ | auth_nntphost: |
+
-
- |
+
+
@@ -20,8 +20,8 @@
|
- | auth_nntpport: |
-
+ | auth_nntpport: |
+
|
@@ -31,8 +31,8 @@
- | : |
-
+ | : |
+
|
diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index 6a5a2bbe96890..6eb389656d3a4 100644
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -13,11 +13,11 @@
}
?>
|
- | auth_pop3host: |
-
+ | auth_pop3host: |
+
-
- |
+
+
@@ -25,8 +25,8 @@
|
- | auth_pop3type: |
-
+ | auth_pop3type: |
+
|
- | auth_pop3port: |
-
+ | auth_pop3port: |
+
|
@@ -51,8 +51,8 @@
- | auth_pop3mailbox: |
-
+ | auth_pop3mailbox: |
+
|
@@ -62,8 +62,8 @@
- | : |
-
+ | : |
+
|
diff --git a/auth/pop3/lib.php b/auth/pop3/lib.php
index c4f24a624e7bf..e5faf1095b32e 100644
--- a/auth/pop3/lib.php
+++ b/auth/pop3/lib.php
@@ -12,7 +12,7 @@ function auth_user_login ($username, $password) {
foreach ($hosts as $host) { // Try each host in turn
$host = trim($host);
-
+
// remove any trailing slash
if (substr($host, -1) == '/') {
$host = substr($host, 0, strlen($host) - 1);
diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html
index 8b29935a898c6..1a087f3680b79 100755
--- a/auth/shibboleth/config.html
+++ b/auth/shibboleth/config.html
@@ -1,102 +1,102 @@
auth_instructions) or empty($config->shib_user_attribute)) {
- $config->auth_instructions = get_string('auth_shib_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/shib-protected.php');
+ $config->auth_instructions = get_string('auth_shib_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/shib-protected.php');
}
if (!isset($config->auth_user_firstname_updatelocal)) {
- $config->auth_user_firstname_updatelocal = 1;
+ $config->auth_user_firstname_updatelocal = 1;
}
if (!isset($config->auth_shib_only)) {
- $config->auth_shib_only = 0;
+ $config->auth_shib_only = 0;
}
if (!isset($config->auth_user_firstname_updatelocal)) {
- $config->auth_user_firstname_updatelocal = 1;
+ $config->auth_user_firstname_updatelocal = 1;
}
if (!isset($config->auth_user_firstname_editlock)) {
- $config->auth_user_firstname_editlock = 0;
+ $config->auth_user_firstname_editlock = 0;
}
if (!isset($config->auth_user_lastname_updatelocal)) {
- $config->auth_user_lastname_updatelocal = 1;
+ $config->auth_user_lastname_updatelocal = 1;
}
if (!isset($config->auth_user_lastname_editlock)) {
- $config->auth_user_lastname_editlock = 0;
+ $config->auth_user_lastname_editlock = 0;
}
if (!isset($config->auth_user_email_updatelocal)) {
- $config->auth_user_email_updatelocal = 1;
+ $config->auth_user_email_updatelocal = 1;
}
if (!isset($config->auth_user_email_editlock)) {
- $config->auth_user_email_editlock = 0;
+ $config->auth_user_email_editlock = 0;
}
if (!isset($config->auth_user_phone1_updatelocal)) {
- $config->auth_user_phone1_updatelocal = 1;
+ $config->auth_user_phone1_updatelocal = 1;
}
if (!isset($config->auth_user_phone1_editlock)) {
- $config->auth_user_phone1_editlock = 0;
+ $config->auth_user_phone1_editlock = 0;
}
if (!isset($config->auth_user_department_updatelocal)) {
- $config->auth_user_department_updatelocal = 1;
+ $config->auth_user_department_updatelocal = 1;
}
if (!isset($config->auth_user_department_editlock)) {
- $config->auth_user_department_editlock = 0;
+ $config->auth_user_department_editlock = 0;
}
if (!isset($config->auth_user_address_updatelocal)) {
- $config->auth_user_address_updatelocal = 1;
+ $config->auth_user_address_updatelocal = 1;
}
if (!isset($config->auth_user_address_editlock)) {
- $config->auth_user_address_editlock = 0;
+ $config->auth_user_address_editlock = 0;
}
if (!isset($config->auth_user_city_updatelocal)) {
- $config->auth_user_city_updatelocal = 1;
+ $config->auth_user_city_updatelocal = 1;
}
if (!isset($config->auth_user_city_editlock)) {
- $config->auth_user_city_editlock = 0;
+ $config->auth_user_city_editlock = 0;
}
if (!isset($config->auth_user_country_updatelocal)) {
- $config->auth_user_country_updatelocal = 1;
+ $config->auth_user_country_updatelocal = 1;
}
if (!isset($config->auth_user_country_editlock)) {
- $config->auth_user_country_editlock = 0;
+ $config->auth_user_country_editlock = 0;
}
if (!isset($config->auth_user_description_updatelocal)) {
- $config->auth_user_description_updatelocal = 1;
+ $config->auth_user_description_updatelocal = 1;
}
if (!isset($config->auth_user_description_editlock)) {
- $config->auth_user_description_editlock = 0;
+ $config->auth_user_description_editlock = 0;
}
if (!isset($config->auth_user_idnumber_updatelocal)) {
- $config->auth_user_idnumber_updatelocal = 1;
+ $config->auth_user_idnumber_updatelocal = 1;
}
if (!isset($config->auth_user_idnumber_editlock)) {
- $config->auth_user_idnumber_editlock = 0;
+ $config->auth_user_idnumber_editlock = 0;
}
if (!isset($config->auth_user_lang_updatelocal)) {
- $config->auth_user_lang_updatelocal = 1;
+ $config->auth_user_lang_updatelocal = 1;
}
if (!isset($config->auth_user_lang_editlock)) {
- $config->auth_user_lang_editlock = 0;
+ $config->auth_user_lang_editlock = 0;
}
?>
@@ -391,8 +391,8 @@
|
- | : |
-
+ | : |
+
|
@@ -407,4 +407,4 @@
|
|
-
\ No newline at end of file
+
diff --git a/auth/shibboleth/lib.php b/auth/shibboleth/lib.php
index f08f57bcabb27..a5d378ba60d0a 100755
--- a/auth/shibboleth/lib.php
+++ b/auth/shibboleth/lib.php
@@ -62,7 +62,7 @@ function auth_get_userinfo($username) {
function auth_shib_attributes (){
//returns array containg attribute mappings between Moodle and shibboleth
- global $CFG;
+ global $CFG;
$config = (array)$CFG;
$fields = array("firstname", "lastname", "email", "phone1", "phone2",
@@ -77,6 +77,6 @@ function auth_shib_attributes (){
}
$moodleattributes['username']=$config["shib_user_attribute"];
- return $moodleattributes;
+ return $moodleattributes;
}
?>
diff --git a/backup/backup_form.html b/backup/backup_form.html
index 673cb2d8c626e..65ae4e001e2dc 100644
--- a/backup/backup_form.html
+++ b/backup/backup_form.html
@@ -166,7 +166,7 @@
else {
echo '';
}
-
+
if (empty($to)) {
//Now print the User Files tr
echo "";
diff --git a/blocks/db/postgres7.php b/blocks/db/postgres7.php
index 4b2c0b82485b3..d04a70c6d54e5 100644
--- a/blocks/db/postgres7.php
+++ b/blocks/db/postgres7.php
@@ -35,7 +35,7 @@ function blocks_upgrade($oldversion=0) {
lastcron INT8 NOT NULL default '0',
visible int NOT NULL default '1'
)
- ") ;
+ ") ;
}
diff --git a/blocks/glossary_random/config_instance.html b/blocks/glossary_random/config_instance.html
index 9d7cb3e75cf89..43056d4f6b0da 100644
--- a/blocks/glossary_random/config_instance.html
+++ b/blocks/glossary_random/config_instance.html
@@ -27,7 +27,7 @@
| config->type, "");
helpbutton("",get_string("type","block_glossary_random"),"moodle",true,false,get_string("typehelp","block_glossary_random"));
- ?> |
+ ?>
diff --git a/calendar/preferences.html b/calendar/preferences.html
index 19d113e1eb10b..8bb6ec425f68e 100644
--- a/calendar/preferences.html
+++ b/calendar/preferences.html
@@ -2,8 +2,8 @@
diff --git a/calendar/preferences.php b/calendar/preferences.php
index 488f4b2a13c05..a685104611fca 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -16,7 +16,7 @@
/// If data submitted, then process and store.
- if ($form = data_submitted()) {
+ if ($form = data_submitted()) {
print_header();
foreach ($form as $preference => $value) {
switch ($preference) {
@@ -79,7 +79,7 @@
$prefs->lookahead = get_user_preferences('calendar_lookahead', CALENDAR_UPCOMING_DAYS);
$prefs->persistflt = get_user_preferences('calendar_persistflt', 0);
- include('./preferences.html');
+ include('./preferences.html');
print_simple_box_end();
print_footer($course);
diff --git a/course/delete.php b/course/delete.php
index 578ded782bc1a..538e0318c6862 100644
--- a/course/delete.php
+++ b/course/delete.php
@@ -1,7 +1,7 @@
shortname: $strdeletecheck", $site->fullname,
+ print_header("$site->shortname: $strdeletecheck", $site->fullname,
"admin/index.php\">$stradministration -> ".
"$strcategories -> ".
"category\">$category->name -> ".
@@ -57,7 +57,7 @@
$strdeletingcourse = get_string("deletingcourse", "", $course->shortname);
- print_header("$site->shortname: $strdeletingcourse", $site->fullname,
+ print_header("$site->shortname: $strdeletingcourse", $site->fullname,
"admin/index.php\">$stradministration -> ".
"$strcategories -> ".
"category\">$category->name -> ".
diff --git a/course/editsection.php b/course/editsection.php
index 97a487aaf56e6..8e390d5c7fd1b 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -50,7 +50,7 @@
$sectionname = get_string("name$course->format");
$stredit = get_string("edit", "", " $sectionname $section->section");
- print_header("$course->shortname: $stredit", "$course->fullname",
+ print_header("$course->shortname: $stredit", "$course->fullname",
"wwwroot/course/view.php?id=$course->id\">$course->shortname
-> $stredit");
diff --git a/course/enrol.php b/course/enrol.php
index 1a930cf72b805..dc1ee8f2fff3c 100644
--- a/course/enrol.php
+++ b/course/enrol.php
@@ -66,26 +66,26 @@
//as a guest, and course setting allow unlimited guest access
//Code cribbed from course/loginas.php
if (isset($loginasguest) && ($course->guest==1)) {
- $realuser = $USER->id;
- $realname = fullname($USER, true);
- $USER = guest_user();
- $USER->loggedin = true;
- $USER->site = $CFG->wwwroot;
- $USER->realuser = $realuser;
- $USER->sessionIP = md5(getremoteaddr()); // Store the current IP in the session
- if (isset($SESSION->currentgroup)) { // Remember current cache setting for later
- $SESSION->oldcurrentgroup = $SESSION->currentgroup;
- unset($SESSION->currentgroup);
- }
- $guest_name = fullname($USER, true);
- add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&$USER->id$", "$realname -> $guest_name");
- if ($SESSION->wantsurl) {
- $destination = $SESSION->wantsurl;
- unset($SESSION->wantsurl);
- } else {
- $destination = "$CFG->wwwroot/course/view.php?id=$course->id";
- }
- redirect($destination);
+ $realuser = $USER->id;
+ $realname = fullname($USER, true);
+ $USER = guest_user();
+ $USER->loggedin = true;
+ $USER->site = $CFG->wwwroot;
+ $USER->realuser = $realuser;
+ $USER->sessionIP = md5(getremoteaddr()); // Store the current IP in the session
+ if (isset($SESSION->currentgroup)) { // Remember current cache setting for later
+ $SESSION->oldcurrentgroup = $SESSION->currentgroup;
+ unset($SESSION->currentgroup);
+ }
+ $guest_name = fullname($USER, true);
+ add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&$USER->id$", "$realname -> $guest_name");
+ if ($SESSION->wantsurl) {
+ $destination = $SESSION->wantsurl;
+ unset($SESSION->wantsurl);
+ } else {
+ $destination = "$CFG->wwwroot/course/view.php?id=$course->id";
+ }
+ redirect($destination);
}
$enrol->check_entry($form, $course);
}
diff --git a/course/groups.php b/course/groups.php
index c0c8c3d16733f..8c9992449f82c 100644
--- a/course/groups.php
+++ b/course/groups.php
@@ -2,8 +2,8 @@
/// Editing interface to edit all the groups in a course
- require_once('../config.php');
- require_once('lib.php');
+ require_once('../config.php');
+ require_once('lib.php');
$courseid = required_param('id'); // Course id
$selectedgroup = optional_param('group', NULL); // Current group id
diff --git a/course/importstudents.html b/course/importstudents.html
index 9257bd7593b7c..208dce270b055 100644
--- a/course/importstudents.html
+++ b/course/importstudents.html
@@ -20,9 +20,9 @@
document.studentform.remove.disabled=false;
document.studentform.addselect.selectedIndex=-1;">
id\">".course_format_name($course,60)."\n";
- }
+ foreach ($alreadycourses as $course) {
+ echo "\n";
+ }
?>
|
@@ -38,11 +38,11 @@
document.studentform.remove.disabled=true;
document.studentform.removeselect.selectedIndex=-1;">
\n";
foreach ($searchcourses as $course) {
- echo "\n";
+ echo "\n";
}
echo "\n";
}
diff --git a/course/importstudents.php b/course/importstudents.php
index 433afebf1f59e..863d3785d3592 100644
--- a/course/importstudents.php
+++ b/course/importstudents.php
@@ -100,9 +100,9 @@
if (array_key_exists($tmp->id,$alreadycourses)) {
unset($searchcourses[$tmp->id]);
}
- if (!empty($tmp->metacourse)) {
- unset($searchcourses[$tmp->id]);
- }
+ if (!empty($tmp->metacourse)) {
+ unset($searchcourses[$tmp->id]);
+ }
}
if (array_key_exists($course->id,$searchcourses)) {
unset($searchcourses[$course->id]);
diff --git a/doc/docstyles.css b/doc/docstyles.css
index ab9449a8a66e5..5e388c8bb5bdc 100755
--- a/doc/docstyles.css
+++ b/doc/docstyles.css
@@ -27,7 +27,7 @@ form {
li {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
@@ -48,10 +48,10 @@ li {
}
.normaltext {
- font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
- font-size: medium;
- border: none;
- margin-left: 30px;
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+ font-size: medium;
+ border: none;
+ margin-left: 30px;
}
@@ -70,62 +70,62 @@ li {
}
.examplecode {
- font-family: "Courier New", Courier, mono;
- font-size: small;
- border: thin dashed #999999;
- background-color: #FBFBFB;
- margin: auto;
- padding: 30px;
- height: auto;
- width: auto;
+ font-family: "Courier New", Courier, mono;
+ font-size: small;
+ border: thin dashed #999999;
+ background-color: #FBFBFB;
+ margin: auto;
+ padding: 30px;
+ height: auto;
+ width: auto;
}
h1 {
- font-weight: bold;
- color: #000000;
- background-color: #CCCCCC;
- padding: 5px;
- font-size: large;
+ font-weight: bold;
+ color: #000000;
+ background-color: #CCCCCC;
+ padding: 5px;
+ font-size: large;
border-width: 1px;
border-color: #CCCCCC;
-moz-border-radius: 10px;
}
h2 {
- font-weight: bold;
- color: #FFFFFF;
- background-color: #666666;
- padding: 5px;
- font-size: medium;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #666666;
+ padding: 5px;
+ font-size: medium;
border-width: 1px;
border-color: #666666;
-moz-border-radius: 10px;
}
h3 {
- font-weight: normal;
- color: #FFFFFF;
- background-color: #666666;
- padding: 5px;
- font-size: medium;
+ font-weight: normal;
+ color: #FFFFFF;
+ background-color: #666666;
+ padding: 5px;
+ font-size: medium;
-moz-border-radius: 10px;
}
.spaced {
- margin-bottom: 30px;
+ margin-bottom: 30px;
}
ul {
- margin-top: 10px;
+ margin-top: 10px;
}
.commandline {
- font-family: "Courier New", Courier, mono;
- font-size: x-small;
- background-color: #FBFBFB;
- margin: auto auto 20px 30px;
- padding: 5px;
- width: compact;
- font-weight: bold;
- border: 1px solid #999999;
- white-space: nowrap;
- clear: both;
- float: none;
+ font-family: "Courier New", Courier, mono;
+ font-size: x-small;
+ background-color: #FBFBFB;
+ margin: auto auto 20px 30px;
+ padding: 5px;
+ width: compact;
+ font-weight: bold;
+ border: 1px solid #999999;
+ white-space: nowrap;
+ clear: both;
+ float: none;
}
|