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

Tabs are out

Browse Source
This commit is contained in:
stronk7
2005-05-16 19:38:21 +00:00
parent 1f48479ebf
commit ef9b35a01b
32 changed files with 267 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/admin.php
+2 -2
View File
@@ -1,7 +1,7 @@
<?PHP // $Id$
// Admin-only script to assign administrative rights to users
require_once("../config.php");
require_once("../config.php");
define("MAX_USERS_PER_PAGE", 50);
@@ -48,7 +48,7 @@
$$strstringtoload = get_string($stringtoload);
}
print_header("$site->shortname: $strassignadmins",
print_header("$site->shortname: $strassignadmins",
"$site->fullname",
"<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "adminform.searchtext");
admin/creators.php
+2 -2
View File
@@ -1,7 +1,7 @@
<?PHP // $Id$
// Admin only script to assign course creator rights to users
require_once("../config.php");
require_once("../config.php");
define("MAX_USERS_PER_PAGE", 50);
@@ -42,7 +42,7 @@
$$strstringtoload = get_string($stringtoload);
}
print_header("$site->shortname: $strassigncreators",
print_header("$site->shortname: $strassigncreators",
"$site->fullname",
"<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> ->
$strassigncreators", "creatorsform.searchtext");
admin/dbperformance.php
+1 -1
View File
@@ -14,7 +14,7 @@
$site = get_site();
if (isset($topframe)) {
print_header("$site->shortname: $strdatabaseperformance", "$site->fullname",
print_header("$site->shortname: $strdatabaseperformance", "$site->fullname",
"<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
exit;
}
admin/enrol.php
+3 -3
View File
@@ -27,12 +27,12 @@
/// If data submitted, then process and store.
if ($frm = data_submitted()) {
if ($frm = data_submitted()) {
if ($enrolment->process_config($frm)) {
set_config('enrol', $frm->enrol);
redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
}
} else {
} else {
$frm = $CFG;
}
@@ -59,7 +59,7 @@
/// Choose an enrolment method
echo get_string('chooseenrolmethod').': ';
choose_from_menu ($options, "enrol", $enrol, "",
choose_from_menu ($options, "enrol", $enrol, "",
"document.location='enrol.php?sesskey=$USER->sesskey&enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
echo "</b></p></div>";
admin/filters.html
+9 -9
View File
@@ -85,8 +85,8 @@
<input type="hidden" name="options" value="1">
<table cellpadding="20">
<tr valign="top">
<td nowrap="nowrap" align="right"><?php p($strcachetext) ?>:</td>
<td>
<td nowrap="nowrap" align="right"><?php p($strcachetext) ?>:</td>
<td>
<?php
unset($options);
$options[604800] = get_string('numdays', '', 7);
@@ -115,12 +115,12 @@
?>
</td>
<td>
<?php p($strconfigcachetext) ?>
<?php p($strconfigcachetext) ?>
</td>
</tr>
<tr valign="top">
<td nowrap="nowrap" align="right"><?php p($strfilteruploadedfiles) ?>:</td>
<td>
<td nowrap="nowrap" align="right"><?php p($strfilteruploadedfiles) ?>:</td>
<td>
<?php
unset($options);
$options[0] = get_string('no');
@@ -130,12 +130,12 @@
?>
</td>
<td>
<?php p($strconfigfilteruploadedfiles) ?>
<?php p($strconfigfilteruploadedfiles) ?>
</td>
</tr>
<tr valign="top">
<td nowrap="nowrap" align="right"><?php p($strfilterall) ?>:</td>
<td>
<td nowrap="nowrap" align="right"><?php p($strfilterall) ?>:</td>
<td>
<?php
unset($options);
$options[0] = get_string('no');
@@ -145,7 +145,7 @@
?>
</td>
<td>
<?php p($strconfigfilterall) ?>
<?php p($strconfigfilterall) ?>
</td>
</tr>
<tr valign="top">
admin/filters.php
+1 -1
View File
@@ -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) {
admin/phpinfo.php
+1 -1
View File
@@ -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",
"<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> PHP info");
exit;
}
admin/process_email.php
+3 -3
View File
@@ -45,7 +45,7 @@ $modargs = substr($address,6,-16);
$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 @@ else {
$function = $modname.'_process_email';
if (!function_exists($function)) {
die();
die();
}
$fd = fopen('php://stdin','r');
if (!$fd) {
@@ -76,4 +76,4 @@ fclose($handle);
?>
?>
admin/register.php
+1 -1
View File
@@ -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",
"<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
print_heading($strregistration);
admin/uploaduser.php
+36 -36
View File
@@ -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);
}
auth/db/config.html
+46 -46
View File
@@ -28,19 +28,19 @@
}
?>
<tr valign="top" class="required">
<td align="right">auth_dbhost:</td>
<td>
<td align="right">auth_dbhost:</td>
<td>
<input name="auth_dbhost" type="text" size="30" value="<?php echo $config->auth_dbhost?>" />
<?php if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
</td>
<?php if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
</td>
<td>
<?php print_string("auth_dbhost","auth") ?>
</td>
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbtype:</td>
<td>
<td align="right">auth_dbtype:</td>
<td>
<?php $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
foreach ($dbtypes as $dbtype) {
$dboptions[$dbtype] = $dbtype;
@@ -55,8 +55,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbname:</td>
<td>
<td align="right">auth_dbname:</td>
<td>
<input name="auth_dbname" type="text" size="30" value="<?php echo $config->auth_dbname?>" />
<?php if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
</td>
@@ -66,8 +66,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbuser:</td>
<td>
<td align="right">auth_dbuser:</td>
<td>
<input name="auth_dbuser" type="text" size="30" value="<?php echo $config->auth_dbuser?>" />
<?php if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
</td>
@@ -77,8 +77,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbpass:</td>
<td>
<td align="right">auth_dbpass:</td>
<td>
<input name="auth_dbpass" type="text" size="30" value="<?php echo $config->auth_dbpass?>" />
<?php if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
</td>
@@ -88,8 +88,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbtable:</td>
<td>
<td align="right">auth_dbtable:</td>
<td>
<input name="auth_dbtable" type="text" size="30" value="<?php echo $config->auth_dbtable?>" />
<?php if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
</td>
@@ -99,8 +99,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbfielduser:</td>
<td>
<td align="right">auth_dbfielduser:</td>
<td>
<input name="auth_dbfielduser" type="text" size="30" value="<?php echo $config->auth_dbfielduser?>" />
<?php if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
</td>
@@ -110,8 +110,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbfieldpass:</td>
<td>
<td align="right">auth_dbfieldpass:</td>
<td>
<input name="auth_dbfieldpass" type="text" size="30" value="<?php echo $config->auth_dbfieldpass?>" />
<?php if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
</td>
@@ -121,8 +121,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_dbpasstype:</td>
<td>
<td align="right">auth_dbpasstype:</td>
<td>
<?php
$passtype["plaintext"] = get_string("plaintext", "auth");
$passtype["md5"] = get_string("md5", "auth");
@@ -137,8 +137,8 @@
<tr>
<td align="right"><?php print_string("firstname") ?>:</td>
<td>
<td align="right"><?php print_string("firstname") ?>:</td>
<td>
<input name="auth_user_firstname" type="text" size="30" value="<?php echo $config->auth_user_firstname?>" />
</td>
<td rowspan="12" valign="middle">
@@ -147,86 +147,86 @@
</tr>
<tr valign="top">
<td align="right"><?php print_string("lastname") ?>:</td>
<td>
<td align="right"><?php print_string("lastname") ?>:</td>
<td>
<input name="auth_user_lastname" type="text" size="30" value="<?php echo $config->auth_user_lastname?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("email") ?>:</td>
<td>
<td align="right"><?php print_string("email") ?>:</td>
<td>
<input name="auth_user_email" type="text" size="30" value="<?php echo $config->auth_user_email?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("phone") ?> 1:</td>
<td>
<td align="right"><?php print_string("phone") ?> 1:</td>
<td>
<input name="auth_user_phone1" type="text" size="30" value="<?php echo $config->auth_user_phone1?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("phone") ?> 2:</td>
<td>
<td align="right"><?php print_string("phone") ?> 2:</td>
<td>
<input name="auth_user_phone2" type="text" size="30" value="<?php echo $config->auth_user_phone2?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("department") ?>:</td>
<td>
<td align="right"><?php print_string("department") ?>:</td>
<td>
<input name="auth_user_department" type="text" size="30" value="<?php echo $config->auth_user_department?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("address") ?>:</td>
<td>
<td align="right"><?php print_string("address") ?>:</td>
<td>
<input name="auth_user_address" type="text" size="30" value="<?php echo $config->auth_user_address?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("city") ?>:</td>
<td>
<td align="right"><?php print_string("city") ?>:</td>
<td>
<input name="auth_user_city" type="text" size="30" value="<?php echo $config->auth_user_city?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("country") ?>:</td>
<td>
<td align="right"><?php print_string("country") ?>:</td>
<td>
<input name="auth_user_country" type="text" size="30" value="<?php echo $config->auth_user_country?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("description") ?>:</td>
<td>
<td align="right"><?php print_string("description") ?>:</td>
<td>
<input name="auth_user_description" type="text" size="30" value="<?php echo $config->auth_user_description?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("idnumber") ?>:</td>
<td>
<td align="right"><?php print_string("idnumber") ?>:</td>
<td>
<input name="auth_user_idnumber" type="text" size="30" value="<?php echo $config->auth_user_idnumber?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("language") ?>:</td>
<td>
<td align="right"><?php print_string("language") ?>:</td>
<td>
<input name="auth_user_lang" type="text" size="30" value="<?php echo $config->auth_user_lang?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php p($config->auth_instructions) ?></textarea>
</td>
<td>
auth/fc/lib.php
+2 -2
View File
@@ -91,7 +91,7 @@ description Get data from users resume. Pictures will be removed.
$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;
}
auth/imap/config.html
+10 -10
View File
@@ -10,11 +10,11 @@
}
?>
<tr valign="top" class="required">
<td align="right">auth_imaphost:</td>
<td>
<td align="right">auth_imaphost:</td>
<td>
<input name="auth_imaphost" type="text" size="30" value="<?php echo $config->auth_imaphost?>" />
<?php if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
</td>
<?php if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
</td>
<td>
<?php print_string("auth_imaphost","auth") ?>
<?php print_string("auth_multiplehosts","auth") ?>
@@ -22,8 +22,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_imaptype:</td>
<td>
<td align="right">auth_imaptype:</td>
<td>
<?php $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
foreach($imaptypes as $imaptype) {
$imapoptions[$imaptype] = $imaptype;
@@ -37,8 +37,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_imapport:</td>
<td>
<td align="right">auth_imapport:</td>
<td>
<input name="auth_imapport" type="text" size="6" value="<?php echo $config->auth_imapport?>" />
<?php if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
</td>
@@ -48,8 +48,8 @@
</tr>
<tr valign="top">
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php p($config->auth_instructions) ?></textarea>
</td>
<td>
auth/ldap/lib.php
+6 -6
View File
@@ -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;
}
/**
auth/manual/config.html
+2 -2
View File
@@ -1,6 +1,6 @@
<tr valign="top">
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php p($config->auth_instructions) ?></textarea>
</td>
<td>
auth/nntp/config.html
+8 -8
View File
@@ -8,11 +8,11 @@
?>
<tr valign="top" class="required">
<td align="right">auth_nntphost:</td>
<td>
<td align="right">auth_nntphost:</td>
<td>
<input name="auth_nntphost" type="text" size="30" value="<?php echo $config->auth_nntphost?>" />
<?php if (isset($err["auth_nntphost"])) formerr($err["auth_nntphost"]); ?>
</td>
<?php if (isset($err["auth_nntphost"])) formerr($err["auth_nntphost"]); ?>
</td>
<td>
<?php print_string("auth_nntphost","auth") ?>
<?php print_string("auth_multiplehosts","auth") ?>
@@ -20,8 +20,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_nntpport:</td>
<td>
<td align="right">auth_nntpport:</td>
<td>
<input name="auth_nntpport" type="text" size="6" value="<?php echo $config->auth_nntpport?>" />
<?php if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
</td>
@@ -31,8 +31,8 @@
</tr>
<tr valign="top">
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php p($config->auth_instructions) ?></textarea>
</td>
<td>
auth/pop3/config.html
+12 -12
View File
@@ -13,11 +13,11 @@
}
?>
<tr valign="top" class="required">
<td align="right">auth_pop3host:</td>
<td>
<td align="right">auth_pop3host:</td>
<td>
<input name="auth_pop3host" type="text" size="30" value="<?php echo $config->auth_pop3host?>" />
<?php if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
</td>
<?php if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
</td>
<td>
<?php print_string("auth_pop3host","auth") ?>
<?php print_string("auth_multiplehosts","auth") ?>
@@ -25,8 +25,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_pop3type:</td>
<td>
<td align="right">auth_pop3type:</td>
<td>
<?php $pop3types = array("pop3","pop3cert", "pop3notls");
foreach($pop3types as $pop3type) {
$pop3options[$pop3type] = $pop3type;
@@ -40,8 +40,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_pop3port:</td>
<td>
<td align="right">auth_pop3port:</td>
<td>
<input name="auth_pop3port" type="text" size="6" value="<?php echo $config->auth_pop3port?>" />
<?php if (isset($err["auth_pop3port"])) formerr($err["auth_pop3port"]); ?>
</td>
@@ -51,8 +51,8 @@
</tr>
<tr valign="top" class="required">
<td align="right">auth_pop3mailbox:</td>
<td>
<td align="right">auth_pop3mailbox:</td>
<td>
<input name="auth_pop3mailbox" type="text" size="6" value="<?php echo $config->auth_pop3mailbox?>" />
<?php if (isset($err["auth_pop3mailbox"])) formerr($err["auth_pop3mailbox"]); ?>
</td>
@@ -62,8 +62,8 @@
</tr>
<tr valign="top">
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php p($config->auth_instructions) ?></textarea>
</td>
<td>
auth/pop3/lib.php
+1 -1
View File
@@ -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);
auth/shibboleth/config.html
+28 -28
View File
@@ -1,102 +1,102 @@
<?php
// Set default values
if (!isset($config->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 @@ if (!isset($config->auth_user_lang_editlock)) {
</tr>
<tr valign="top">
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<td align="right"><?php print_string("instructions", "auth") ?>:</td>
<td>
<textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php p($config->auth_instructions) ?></textarea>
</td>
<td>
@@ -407,4 +407,4 @@ if (!isset($config->auth_user_lang_editlock)) {
</td>
<td><?php print_string("auth_shib_convert_data_description", "auth") ?></td>
</td>
</tr>
</tr>
auth/shibboleth/lib.php
+2 -2
View File
@@ -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;
}
?>
backup/backup_form.html
+1 -1
View File
@@ -166,7 +166,7 @@
else {
echo '<input type="hidden" name="backup_logs" value="0" />';
}
if (empty($to)) {
//Now print the User Files tr
echo "<tr>";
blocks/db/postgres7.php
+1 -1
View File
@@ -35,7 +35,7 @@ global $CFG;
lastcron INT8 NOT NULL default '0',
visible int NOT NULL default '1'
)
") ;
") ;
}
blocks/glossary_random/config_instance.html
+1 -1
View File
@@ -27,7 +27,7 @@
<td><?php
choose_from_menu($type, "type", $this->config->type, "");
helpbutton("",get_string("type","block_glossary_random"),"moodle",true,false,get_string("typehelp","block_glossary_random"));
?></td>
?></td>
</tr>
<tr valign=top>
calendar/preferences.html
+11 -11
View File
@@ -2,8 +2,8 @@
<table class="formtable">
<tr>
<th style="width: 30%;"><?php print_string('pref_timeformat', 'calendar')?>:</th>
<td>
<th style="width: 30%;"><?php print_string('pref_timeformat', 'calendar')?>:</th>
<td>
<?php
$options = array();
$options['0'] = get_string('default', 'calendar');
@@ -16,8 +16,8 @@
</tr>
<tr>
<th><?php print_string('pref_startwday', 'calendar')?>:</th>
<td>
<th><?php print_string('pref_startwday', 'calendar')?>:</th>
<td>
<?php
$options = array();
$options[0] = get_string('sunday', 'calendar');
@@ -34,8 +34,8 @@
</tr>
<tr>
<th><?php print_string('pref_maxevents', 'calendar')?>:</th>
<td>
<th><?php print_string('pref_maxevents', 'calendar')?>:</th>
<td>
<?php
$options = NULL;
for ($i=1; $i<=20; $i++) {
@@ -48,8 +48,8 @@
</tr>
<tr>
<th><?php print_string('pref_lookahead', 'calendar')?>:</th>
<td>
<th><?php print_string('pref_lookahead', 'calendar')?>:</th>
<td>
<?php
$options = NULL;
for ($i=1; $i<=200; $i++) {
@@ -62,8 +62,8 @@
</tr>
<tr>
<th><?php print_string('pref_persistflt', 'calendar')?>:</th>
<td>
<th><?php print_string('pref_persistflt', 'calendar')?>:</th>
<td>
<?php choose_from_menu (array(0 => get_string('no'), 1 => get_string('yes')), 'persistflt', $prefs->persistflt, '', '', ''); ?>
<p><?php print_string('explain_persistflt', 'calendar'); ?></p>
</td>
@@ -71,7 +71,7 @@
<tr>
<td colspan="2" style="text-align: center;">
<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
</tr>
</table>
calendar/preferences.php
+2 -2
View File
@@ -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);
course/delete.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
// Admin-only code to delete a course utterly
require_once("../config.php");
require_once("../config.php");
require_variable($id); // course id
optional_variable($delete); // delete confirmation
@@ -31,7 +31,7 @@
$strdeletecoursecheck = get_string("deletecoursecheck");
print_header("$site->shortname: $strdeletecheck", $site->fullname,
print_header("$site->shortname: $strdeletecheck", $site->fullname,
"<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
"<a href=\"index.php\">$strcategories</a> -> ".
"<a href=\"category.php?id=$course->category\">$category->name</a> -> ".
@@ -57,7 +57,7 @@
$strdeletingcourse = get_string("deletingcourse", "", $course->shortname);
print_header("$site->shortname: $strdeletingcourse", $site->fullname,
print_header("$site->shortname: $strdeletingcourse", $site->fullname,
"<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
"<a href=\"index.php\">$strcategories</a> -> ".
"<a href=\"category.php?id=$course->category\">$category->name</a> -> ".
course/editsection.php
+1 -1
View File
@@ -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",
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a>
-> $stredit");
course/enrol.php
+20 -20
View File
@@ -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);
}
course/groups.php
+2 -2
View File
@@ -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
course/importstudents.html
+5 -5
View File
@@ -20,9 +20,9 @@
document.studentform.remove.disabled=false;
document.studentform.addselect.selectedIndex=-1;">
<?php
foreach ($alreadycourses as $course) {
echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
}
foreach ($alreadycourses as $course) {
echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
}
?>
</select></td>
<td valign="top">
@@ -38,11 +38,11 @@
document.studentform.remove.disabled=true;
document.studentform.removeselect.selectedIndex=-1;">
<?php
if (!empty($searchcourses)) {
echo "<optgroup label=\"$strsearchresults (" . count($searchcourses) . ")\">\n";
foreach ($searchcourses as $course) {
echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
}
echo "</optgroup>\n";
}
course/importstudents.php
+3 -3
View File
@@ -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]);
doc/docstyles.css
+41 -41
View File
@@ -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;
}