diff options
| -rw-r--r-- | modules/user.module | 28 | ||||
| -rw-r--r-- | modules/user/user.module | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/modules/user.module b/modules/user.module index 5ac4b8055..6e0e0a943 100644 --- a/modules/user.module +++ b/modules/user.module @@ -88,31 +88,30 @@ function user_save($account, $array = array()) { $query .= "$key = '". addslashes($value) ."', "; } } + db_query("UPDATE users SET $query timestamp = '". time() ."' WHERE uid = '$account->uid'"); + + $user = user_load(array("uid" => $account->uid)); } else { - $fields = "("; - $values = "("; - $num = 0; + $array["timestamp"] = time(); foreach ($array as $key => $value) { - if (substr($key, 0, 4) !== "auth") { - $fields .= ($num ? ", " : "") . $key; - $values .= ($num ? ", " : "") . (($key == "pass") ? "'" . md5($value) . "'" : "'" . addslashes($value) . "'"); - $num = 1; + if ($key == "pass") { + $fields[] = check_query($key); + $values[] = "'". md5($value) ."'"; + } + else if (substr($key, 0, 4) !== "auth") { + $fields[] = check_query($key); + $values[] = "'". check_query($value) ."'"; } } - $fields .= ($num ? ", " : "") . "timestamp"; - $values .= ($num ? ", " : "") . "'" . time() ."'"; - $fields .= ")"; - $values .= ")"; + db_query("INSERT INTO users (". implode(", ", $fields) .") VALUES (". implode(", ", $values) .")"); - db_query("INSERT INTO users $fields VALUES $values"); + $user = user_load(array("name" => $array["name"])); } - $user = user_load(array("name" => $array["name"])); - foreach ($array as $key => $value) { if (substr($key, 0, 4) == "auth") { $authmaps[$key] = $value; @@ -1245,6 +1244,7 @@ function user_admin_edit($edit = array()) { global $op, $id, $HTTP_HOST; if ($account = user_load(array("uid" => $id))) { + if ($op == "Save account") { $account = user_save($account, $edit); } diff --git a/modules/user/user.module b/modules/user/user.module index 5ac4b8055..6e0e0a943 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -88,31 +88,30 @@ function user_save($account, $array = array()) { $query .= "$key = '". addslashes($value) ."', "; } } + db_query("UPDATE users SET $query timestamp = '". time() ."' WHERE uid = '$account->uid'"); + + $user = user_load(array("uid" => $account->uid)); } else { - $fields = "("; - $values = "("; - $num = 0; + $array["timestamp"] = time(); foreach ($array as $key => $value) { - if (substr($key, 0, 4) !== "auth") { - $fields .= ($num ? ", " : "") . $key; - $values .= ($num ? ", " : "") . (($key == "pass") ? "'" . md5($value) . "'" : "'" . addslashes($value) . "'"); - $num = 1; + if ($key == "pass") { + $fields[] = check_query($key); + $values[] = "'". md5($value) ."'"; + } + else if (substr($key, 0, 4) !== "auth") { + $fields[] = check_query($key); + $values[] = "'". check_query($value) ."'"; } } - $fields .= ($num ? ", " : "") . "timestamp"; - $values .= ($num ? ", " : "") . "'" . time() ."'"; - $fields .= ")"; - $values .= ")"; + db_query("INSERT INTO users (". implode(", ", $fields) .") VALUES (". implode(", ", $values) .")"); - db_query("INSERT INTO users $fields VALUES $values"); + $user = user_load(array("name" => $array["name"])); } - $user = user_load(array("name" => $array["name"])); - foreach ($array as $key => $value) { if (substr($key, 0, 4) == "auth") { $authmaps[$key] = $value; @@ -1245,6 +1244,7 @@ function user_admin_edit($edit = array()) { global $op, $id, $HTTP_HOST; if ($account = user_load(array("uid" => $id))) { + if ($op == "Save account") { $account = user_save($account, $edit); } |