diff options
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 1f1493385..a788b1dc1 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -532,7 +532,7 @@ function user_login($edit = array(), $msg = "") { if (!$user && $server && $result = user_get_authmaps("$name@$server")) { if (module_invoke(key($result), "auth", $name, $pass, $server)) { $user = user_external_load("$name@$server"); - watchdog("user", "external load: $name@$server, module: " . key($result)); + watchdog("user", "external load: $name@$server, module: ". key($result)); } else { $error = t("Invalid password for %s.", array("%s" => "<i>$name@$server</i>")); @@ -548,8 +548,8 @@ function user_login($edit = array(), $msg = "") { if (module_hook($module, "auth")) { if (module_invoke($module, "auth", $name, $pass, $server)) { if (variable_get("user_register", 1) == 1 && !user_load(array("name" => "$name@$server"))) { //register this new user - watchdog("user", "new user: $name@$server ($module ID)"); $user = user_save("", array("name" => "$name@$server", "pass" => user_password(), "init" => "$name@$server", "status" => 1, "authname_$module" => "$name@$server", "rid" => _user_authenticated_id())); + watchdog("user", "new user: $name@$server ($module ID)", la("edit user", array("mod" => "user", "op" => "edit", "id" => $user->uid))); break; } } @@ -788,7 +788,7 @@ function user_register($edit = array()) { // TODO: is this necessary? Won't session_write replicate this? unset($edit["session"]); $account = user_save("", array_merge(array("name" => $edit["name"], "pass" => $pass, "init" => $edit["mail"], "mail" => $edit["mail"], "rid" => _user_authenticated_id(), "rating" => 0, "status" => (variable_get("user_register", 1) == 1 ? 1 : 0)), $data)); - watchdog("user", "new user: '". $edit["name"] ."' <". $edit["mail"] .">"); + watchdog("user", "new user: '". $edit["name"] ."' <". $edit["mail"] .">", la("edit user", array("mod" => "user", "op" => "edit", "id" => $account->uid))); $variables = array("%username" => $edit["name"], "%site" => variable_get("site_name", "drupal"), "%password" => $pass, "%uri" => path_uri(), "%uri_brief" => path_uri(1), "%mailto" => $edit["mail"], "%date" => format_date(time())); @@ -1134,7 +1134,6 @@ function user_admin_create($edit = array()) { } if ($success) { - watchdog("user", "new user: '". $edit["name"] ."' <". $edit["mail"] .">"); user_save("", array("name" => $edit["name"], "pass" => $edit["pass"], "init" => $edit["mail"], "mail" => $edit["mail"], "rid" => _user_authenticated_id(), "status" => 1)); @@ -1719,16 +1718,13 @@ function user_help_devel_da() { // Since Blogger doesn't return a properly formed FaultCode, we just search for the string 'fault'. if ($result && !stristr($result->serialize(), "fault")) { - // watchdog("user", "Success Blogger Auth. Response: " . $result->serialize()); return 1; } else if ($result) { - // watchdog("user", "Blogger Auth failure. Response was " . $result->serialize()); return 0; } else { - // watchdog("user", "Blogger Auth failure. Could not connect."); return 0; } }</pre> @@ -1778,15 +1774,12 @@ function user_help_devel_da() { to the user.module if your registration database has become inoperable or unreachable.</p> <pre> if ($result && !stristr($result->serialize(), "fault")) { - // watchdog("user", "Success Blogger auth. Response was " . $result->serialize()); return 1; } else if ($result) { - // watchdog("user", "Blogger auth failure. Response was " . $result->serialize()); return 0; } else { - // watchdog("user", "Blogger auth failure. Could not connect.");<br> return 0; } </pre> @@ -1796,8 +1789,7 @@ function user_help_devel_da() { testing for all cases. In the case of Blogger, we search for the string 'fault' in the response. If that string is present, or there is no repsonse, our function returns FALSE. Otherwise, Blogger has returned valid data to our method request - and we return TRUE. There are several watchdog() calls here which are commented - out. These are useful for debugging, so I've left them in the code as comments. + and we return TRUE. </p> <pre>function blogger_page() { global $theme; |