From d96466d29f07365e947cf8f407e0239392de8d10 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Fri, 9 Jun 2006 10:04:43 +0000 Subject: [PATCH] Moving from lastIP to lastip everywhere. Bug 5763. (http://moodle.org/bugs/bug.php?op=show&bugid=5763) Merged from MOODLE_16_STABLE --- lib/datalib.php | 2 +- lib/db/migrate2utf8.xml | 2 +- lib/moodlelib.php | 4 ++-- mod/chat/lib.php | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index 588264fa7b..236809db7c 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -2832,7 +2832,7 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user echo '

Error: Could not insert a new entry to the Moodle log

'; // Don't throw an error } if ( isset($USER) && (empty($user) || $user==$USER->id) ) { - $db->Execute('UPDATE '. $CFG->prefix .'user SET lastIP=\''. $REMOTE_ADDR .'\', lastaccess=\''. $timenow .'\' + $db->Execute('UPDATE '. $CFG->prefix .'user SET lastip=\''. $REMOTE_ADDR .'\', lastaccess=\''. $timenow .'\' WHERE id = \''. $userid .'\' '); if ($courseid != SITEID && !empty($courseid)) { // logins etc dont't have a courseid and isteacher will break without it. if (defined('MDL_PERFDB')) { global $PERF ; $PERF->dbqueries++;}; diff --git a/lib/db/migrate2utf8.xml b/lib/db/migrate2utf8.xml index 1da266bd8f..f711e8481e 100755 --- a/lib/db/migrate2utf8.xml +++ b/lib/db/migrate2utf8.xml @@ -467,7 +467,7 @@ - + migrate2utf8_user_secret(RECORDID) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 9eac003c0d..69a5e0b264 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -2432,7 +2432,7 @@ function create_user_record($username, $password, $auth='') { update_internal_user_password($newuser, $password, false); $newuser->lang = $CFG->lang; $newuser->confirmed = 1; - $newuser->lastIP = getremoteaddr(); + $newuser->lastip = getremoteaddr(); $newuser->timemodified = time(); if (insert_record('user', $newuser)) { @@ -2522,7 +2522,7 @@ function guest_user() { $newuser->confirmed = 1; $newuser->site = $CFG->wwwroot; $newuser->lang = $CFG->lang; - $newuser->lastIP = getremoteaddr(); + $newuser->lastip = getremoteaddr(); } return $newuser; diff --git a/mod/chat/lib.php b/mod/chat/lib.php index 8a4051b07a..c8d550b089 100644 --- a/mod/chat/lib.php +++ b/mod/chat/lib.php @@ -384,11 +384,11 @@ function chat_login_user($chatid, $version, $groupid, $course) { global $USER; if (($version != 'sockets') and $chatuser = get_record_select('chat_users', "chatid='$chatid' AND userid='$USER->id' AND groupid='$groupid'")) { $chatuser->version = $version; - $chatuser->ip = $USER->lastIP; + $chatuser->ip = $USER->lastip; $chatuser->lastping = time(); $chatuser->lang = current_language(); - // Sometimes $USER->lastIP is not setup properly + // Sometimes $USER->lastip is not setup properly // during login. Update with current value if possible // or provide a dummy value for the db if (empty($chatuser->ip)) { @@ -410,13 +410,13 @@ function chat_login_user($chatid, $version, $groupid, $course) { $chatuser->userid = $USER->id; $chatuser->groupid = $groupid; $chatuser->version = $version; - $chatuser->ip = $USER->lastIP; + $chatuser->ip = $USER->lastip; $chatuser->lastping = $chatuser->firstping = $chatuser->lastmessageping = time(); $chatuser->sid = random_string(32); $chatuser->course = $course->id; //caching - needed for current_language too $chatuser->lang = current_language(); //caching - to resource intensive to find out later - // Sometimes $USER->lastIP is not setup properly + // Sometimes $USER->lastip is not setup properly // during login. Update with current value if possible // or provide a dummy value for the db if (empty($chatuser->ip)) { -- 2.39.5