moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-25708 recordsets - fix admin dir uses

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2010-12-30 00:41:47 +01:00
parent 8cdc85ac62
commit 755d2c74f6
6 changed files with 63 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

53
admin/multilangupgrade.php
View file

@ -56,35 +56,34 @@ foreach ($tables as $table) {
if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) { // Text stuff only if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) { // Text stuff only
// first find candidate records // first find candidate records
$sql = "SELECT id, $column FROM $fulltable WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'"; $sql = "SELECT id, $column FROM $fulltable WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'";
if ($rs = $DB->get_recordset_sql($sql)) { $rs = $DB->get_recordset_sql($sql);
foreach ($rs as $data) { foreach ($rs as $data) {
$text = $data->$column; $text = $data->$column;
$id = $data->id; $id = $data->id;
if ($i % 600 == 0) { if ($i % 600 == 0) {
echo '<br />'; echo '<br />';
} }
if ($i % 10 == 0) { if ($i % 10 == 0) {
echo '.'; echo '.';
} }
$i++; $i++;
if (empty($text) or is_numeric($text)) { if (empty($text) or is_numeric($text)) {
continue; // nothing to do continue; // nothing to do
} }
$search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is'; $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
$newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text); $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
if (is_null($newtext)) { if (is_null($newtext)) {
continue; // regex error continue; // regex error
} }
if ($newtext != $text) { if ($newtext != $text) {
$DB->execute("UPDATE $fulltable SET $column=? WHERE id=?", array($newtext, $id)); $DB->execute("UPDATE $fulltable SET $column=? WHERE id=?", array($newtext, $id));
}
} }
$rs->close();
} }
$rs->close();
} }
} }
} }

11
admin/user/lib.php
View file

@ -11,14 +11,13 @@ function add_selection_all($ufiltering) {
list($sqlwhere, $params) = $ufiltering->get_sql_filter("id<>:exguest AND deleted <> 1", array('exguest'=>$CFG->siteguest)); list($sqlwhere, $params) = $ufiltering->get_sql_filter("id<>:exguest AND deleted <> 1", array('exguest'=>$CFG->siteguest));
if ($rs = $DB->get_recordset_select('user', $sqlwhere, $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname')) { $rs = $DB->get_recordset_select('user', $sqlwhere, $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname');
foreach ($rs as $user) { foreach ($rs as $user) {
if (!isset($SESSION->bulk_users[$user->id])) { if (!isset($SESSION->bulk_users[$user->id])) {
$SESSION->bulk_users[$user->id] = $user->id; $SESSION->bulk_users[$user->id] = $user->id;
}
} }
$rs->close();
} }
$rs->close();
} }
function get_selection_data($ufiltering) { function get_selection_data($ufiltering) {

21
admin/user/user_bulk_confirm.php
View file

@ -24,19 +24,18 @@ echo $OUTPUT->header();
if ($confirm and confirm_sesskey()) { if ($confirm and confirm_sesskey()) {
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
if ($rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname')) { $rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname');
foreach ($rs as $user) { foreach ($rs as $user) {
if ($user->confirmed) { if ($user->confirmed) {
continue; continue;
} }
$auth = get_auth_plugin($user->auth); $auth = get_auth_plugin($user->auth);
$result = $auth->user_confirm($user->username, $user->secret); $result = $auth->user_confirm($user->username, $user->secret);
if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) { if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true))); echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
}
} }
$rs->close();
} }
$rs->close();
redirect($return, get_string('changessaved')); redirect($return, get_string('changessaved'));
} else { } else {

15
admin/user/user_bulk_delete.php
View file

@ -25,16 +25,15 @@ echo $OUTPUT->header();
if ($confirm and confirm_sesskey()) { if ($confirm and confirm_sesskey()) {
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
if ($rs = $DB->get_recordset_select('user', "id $in", $params)) { $rs = $DB->get_recordset_select('user', "id $in", $params);
foreach ($rs as $user) { foreach ($rs as $user) {
if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) { if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) {
unset($SESSION->bulk_users[$user->id]); unset($SESSION->bulk_users[$user->id]);
} else { } else {
echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true))); echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
}
} }
$rs->close();
} }
$rs->close();
session_gc(); // remove stale sessions session_gc(); // remove stale sessions
redirect($return, get_string('changessaved')); redirect($return, get_string('changessaved'));

17
admin/user/user_bulk_forcepasswordchange.php
View file

@ -38,17 +38,16 @@ if ($confirm and confirm_sesskey()) {
$parts = array_chunk($SESSION->bulk_users, 300); $parts = array_chunk($SESSION->bulk_users, 300);
foreach ($parts as $users) { foreach ($parts as $users) {
list($in, $params) = $DB->get_in_or_equal($users); list($in, $params) = $DB->get_in_or_equal($users);
if ($rs = $DB->get_recordset_select('user', "id $in", $params)) { $rs = $DB->get_recordset_select('user', "id $in", $params);
foreach ($rs as $user) { foreach ($rs as $user) {
if (!empty($changeable[$user->auth])) { if (!empty($changeable[$user->auth])) {
set_user_preference('auth_forcepasswordchange', 1, $user->id); set_user_preference('auth_forcepasswordchange', 1, $user->id);
unset($SESSION->bulk_users[$user->id]); unset($SESSION->bulk_users[$user->id]);
} else { } else {
echo $OUTPUT->notification(get_string('forcepasswordchangenot', '', fullname($user, true))); echo $OUTPUT->notification(get_string('forcepasswordchangenot', '', fullname($user, true)));
}
} }
$rs->close();
} }
$rs->close();
} }
echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess'); echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess');
echo $OUTPUT->continue_button($return); echo $OUTPUT->continue_button($return);

15
admin/user/user_bulk_message.php
View file

@ -25,15 +25,14 @@ if (empty($CFG->messaging)) {
if ($confirm and !empty($msg) and confirm_sesskey()) { if ($confirm and !empty($msg) and confirm_sesskey()) {
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
if ($rs = $DB->get_recordset_select('user', "id $in", $params)) { $rs = $DB->get_recordset_select('user', "id $in", $params);
foreach ($rs as $user) { foreach ($rs as $user) {
//TODO we should probably support all text formats here or only FORMAT_MOODLE //TODO we should probably support all text formats here or only FORMAT_MOODLE
//For now bulk messaging is still using the html editor and its supplying html //For now bulk messaging is still using the html editor and its supplying html
//so we have to use html format for it to be displayed correctly //so we have to use html format for it to be displayed correctly
message_post_message($USER, $user, $msg, FORMAT_HTML, 'direct'); message_post_message($USER, $user, $msg, FORMAT_HTML, 'direct');
}
$rs->close();
} }
$rs->close();
redirect($return); redirect($return);
} }