From: donal72 Date: Tue, 23 Jan 2007 21:27:50 +0000 (+0000) Subject: Mnet: Rename field: access to accessctrl for Oracle interop: MDL-8237 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=cdf2232920b4e85aeab035e3149f69758b20ea6e;p=moodle.git Mnet: Rename field: access to accessctrl for Oracle interop: MDL-8237 --- diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index debb9f04ce..99c9cffc41 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -60,15 +60,15 @@ if (!empty($action) and confirm_sesskey()) { case "acl": // require the access parameter, and it must be 'allow' or 'deny' - $access = trim(strtolower(required_param('access', PARAM_ALPHA))); - if ($access != 'allow' and $access != 'deny') { + $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA))); + if ($accessctrl != 'allow' and $accessctrl != 'deny') { error(get_string('invalidaccessparam', 'mnet') , '/admin/mnet/access_control.php'); } - if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $access)) { - if ($access == 'allow') { + if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) { + if ($accessctrl == 'allow') { redirect('access_control.php', get_string('ssl_acl_allow','mnet', array($idrec->username, $mnethosts[$idrec->mnet_host_id]))); - } elseif ($access == 'deny') { + } elseif ($accessctrl == 'deny') { redirect('access_control.php', get_string('ssl_acl_deny','mnet', array($idrec->username, $mnethosts[$idrec->mnet_host_id]))); } } @@ -94,8 +94,8 @@ if ($form = data_submitted() and confirm_sesskey()) { if (empty($form->mnet_host_id)) { $formerror['mnet_host_id'] = get_string('selectahost','mnet'); } - if (empty($form->access)) { - $formerror['access'] = get_string('selectaccesslevel','mnet'); ; + if (empty($form->accessctrl)) { + $formerror['accessctrl'] = get_string('selectaccesslevel','mnet'); ; } // process if there are no errors @@ -107,10 +107,10 @@ if ($form = data_submitted() and confirm_sesskey()) { foreach ($usernames as $username) { $username = trim(moodle_strtolower($username)); if (!empty($username)) { - if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->access)) { - if ($form->access == 'allow') { + if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->accessctrl)) { + if ($form->accessctrl == 'allow') { redirect('access_control.php', get_string('ssl_acl_allow','mnet', array($username, $mnethosts[$form->mnet_host_id]))); - } elseif ($form->access == 'deny') { + } elseif ($form->accessctrl == 'deny') { redirect('access_control.php', get_string('ssl_acl_deny','mnet', array($username, $mnethosts[$form->mnet_host_id]))); } } @@ -173,13 +173,13 @@ if (!$acl) { $table->align = array('left', 'left', 'center'); $table->width = "95%"; foreach ($acl as $aclrecord) { - if ($aclrecord->access == 'allow') { + if ($aclrecord->accessctrl == 'allow') { $accesscolumn = get_string('allow', 'mnet') - . " (id}&action=acl&access=deny&sesskey={$USER->sesskey}\">" + . " (id}&action=acl&accessctrl=deny&sesskey={$USER->sesskey}\">" . get_string('deny', 'mnet') . ")"; } else { $accesscolumn = get_string('deny', 'mnet') - . " (id}&action=acl&access=allow&sesskey={$USER->sesskey}\">" + . " (id}&action=acl&accessctrl=allow&sesskey={$USER->sesskey}\">" . get_string('allow', 'mnet') . ")"; } $deletecolumn = "id}&action=delete&sesskey={$USER->sesskey}\">" @@ -221,12 +221,12 @@ choose_from_menu($mnethosts, 'mnet_host_id'); // choose an access level echo " " . get_string('accesslevel', 'mnet') . ":\n"; -if (!empty($formerror['access'])) { +if (!empty($formerror['accessctrl'])) { echo ' * '; } $accessmenu['allow'] = get_string('allow', 'mnet'); $accessmenu['deny'] = get_string('deny', 'mnet'); -choose_from_menu($accessmenu, 'access'); +choose_from_menu($accessmenu, 'accessctrl'); // submit button echo ''; diff --git a/admin/user.php b/admin/user.php index f1d9aec397..5d74bc5859 100644 --- a/admin/user.php +++ b/admin/user.php @@ -228,8 +228,8 @@ if (!is_mnet_remote_user($user)) { error('Users in the MNET access control list must be remote MNET users.'); } - $access = strtolower(required_param('access', PARAM_ALPHA)); - if ($access != 'allow' and $access != 'deny') { + $accessctrl = strtolower(required_param('accessctrl', PARAM_ALPHA)); + if ($accessctrl != 'allow' and $accessctrl != 'deny') { error('Invalid access parameter.'); } $aclrecord = get_record('mnet_sso_access_control', 'username', $user->username, 'mnet_host_id', $user->mnethostid); @@ -237,12 +237,12 @@ $aclrecord = new object(); $aclrecord->mnet_host_id = $user->mnethostid; $aclrecord->username = $user->username; - $aclrecord->access = $access; + $aclrecord->accessctrl = $accessctrl; if (!insert_record('mnet_sso_access_control', $aclrecord)) { error("Database error - Couldn't modify the MNET access control list."); } } else { - $aclrecord->access = $access; + $aclrecord->accessctrl = $accessctrl; if (!update_record('mnet_sso_access_control', $aclrecord)) { error("Database error - Couldn't modify the MNET access control list."); } @@ -250,7 +250,7 @@ $mnethosts = get_records('mnet_host', '', '', 'id', 'id,wwwroot,name'); notify("MNET access control list updated: username '$user->username' from host '" . $mnethosts[$user->mnethostid]->name - . "' access now set to '$access'."); + . "' access now set to '$accessctrl'."); } // Carry on with the user listing @@ -429,20 +429,20 @@ // for remote users, shuffle columns around and display MNET stuff if (is_mnet_remote_user($user)) { - $access = 'allow'; + $accessctrl = 'allow'; if ($acl = get_record('mnet_sso_access_control', 'username', $user->username, 'mnet_host_id', $user->mnethostid)) { - $access = $acl->access; + $accessctrl = $acl->accessctrl; } - $changeaccessto = ($access == 'deny' ? 'allow' : 'deny'); + $changeaccessto = ($accessctrl == 'deny' ? 'allow' : 'deny'); // delete button in confirm column - remote users should already be confirmed // TODO: no delete for remote users, for now. new userid, delete flag, unique on username/host... $confirmbutton = ""; // ACL in delete column - $deletebutton = ucfirst($access); + $deletebutton = get_string($accessctrl, 'mnet'); if (has_capability('moodle/user:delete', $sitecontext)) { // TODO: this should be under a separate capability - $deletebutton .= " (id}&access=$changeaccessto&sesskey={$USER->sesskey}\">" - . ucfirst($changeaccessto) . " access)"; + $deletebutton .= " (id}&accessctrl=$changeaccessto&sesskey={$USER->sesskey}\">" + . get_string($changeaccessto, 'mnet') . " access)"; } // mnet info in edit column $editbutton = $mnethosts[$user->mnethostid]->name; diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 5b23e27a84..c3a0bb16cb 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -1307,12 +1307,12 @@ class auth_plugin_mnet * @return bool Whether the user can login from the remote host */ function can_login_remotely($username, $mnethostid) { - $access = 'allow'; + $accessctrl = 'allow'; $aclrecord = get_record('mnet_sso_access_control', 'username', $username, 'mnet_host_id', $mnethostid); if (!empty($aclrecord)) { - $access = $aclrecord->access; + $accessctrl = $aclrecord->accessctrl; } - return $access == 'allow'; + return $accessctrl == 'allow'; } } diff --git a/lib/db/install.xml b/lib/db/install.xml index 5f9b4c5ea3..163602fea3 100644 --- a/lib/db/install.xml +++ b/lib/db/install.xml @@ -1156,8 +1156,8 @@ - - + + diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index fcb39fd66a..a6f91c1000 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -578,6 +578,16 @@ function xmldb_main_upgrade($oldversion=0) { $result = $result && change_field_precision($table, $field); } + if ($result && $oldversion < 2007012400) { + + /// Rename field access on table mnet_sso_access_control to accessctrl + $table = new XMLDBTable('mnet_sso_access_control'); + $field = new XMLDBField('access'); + + /// Launch rename field accessctrl + $result = $result && rename_field($table, $field, 'accessctrl'); + } + return $result; } diff --git a/mnet/lib.php b/mnet/lib.php index 61c9849f2a..8aba4009b6 100644 --- a/mnet/lib.php +++ b/mnet/lib.php @@ -461,11 +461,11 @@ function mnet_permit_rpc_call($includefile, $functionname, $class=false) { return RPC_OK; } -function mnet_update_sso_access_control($username, $mnet_host_id, $access) { +function mnet_update_sso_access_control($username, $mnet_host_id, $accessctrl) { $mnethost = get_record('mnet_host', 'id', $mnet_host_id); if ($aclrecord = get_record('mnet_sso_access_control', 'username', $username, 'mnet_host_id', $mnet_host_id)) { // update - $aclrecord->access = $access; + $aclrecord->accessctrl = $accessctrl; if (update_record('mnet_sso_access_control', $aclrecord)) { add_to_log(SITEID, 'admin/mnet', 'update', 'admin/mnet/access_control.php', "SSO ACL: $access user '$username' from {$mnethost->name}"); @@ -476,7 +476,7 @@ function mnet_update_sso_access_control($username, $mnet_host_id, $access) { } else { // insert $aclrecord->username = $username; - $aclrecord->access = $access; + $aclrecord->accessctrl = $accessctrl; $aclrecord->mnet_host_id = $mnet_host_id; if ($id = insert_record('mnet_sso_access_control', $aclrecord)) { add_to_log(SITEID, 'admin/mnet', 'add', 'admin/mnet/access_control.php', diff --git a/version.php b/version.php index d5bdd8cc88..e2778253e9 100644 --- a/version.php +++ b/version.php @@ -6,7 +6,7 @@ // This is compared against the values stored in the database to determine // whether upgrades should be performed (see lib/db/*.php) - $version = 2007012101; // YYYYMMDD = date + $version = 2007012400; // YYYYMMDD = date // XY = increments within a single day $release = '1.8 dev'; // Human-friendly version name