diff --git a/account.php b/account.php
index 65085f1f6ff7eb3082d80db8fa8d9a9e89b66a76..48be2b2b80d978abc78a375f672a219345c53fb2 100644
--- a/account.php
+++ b/account.php
@@ -38,7 +38,7 @@ function account_create($user = "", $error = "") {
$output .= "<SMALL><I>". t("Enter your desired username: only letters, numbers and common special characters are allowed.") ."</I></SMALL><P>\n";
$output .= "<B>". t("E-mail address") .":</B><BR>\n";
$output .= "<INPUT NAME=\"email\"><BR>\n";
- $output .= "<SMALL><I>". t("You will be sent instructions on how to validate your account via this e-mail address - please make sure it is accurate.") ."</I></SMALL><P>\n";
+ $output .= "<SMALL><I>". t("You will be sent instructions on how to validate your account via this e-mail address: make sure it is accurate.") ."</I></SMALL><P>\n";
$output .= "<INPUT NAME=\"op\" TYPE=\"submit\" VALUE=\"Create account\">\n";
$output .= "</FORM>\n";
@@ -267,7 +267,7 @@ function module($name, $module, $username) {
// Display account information:
$theme->header();
- if ($block1) $theme->box(strtr(t("%s's user information"), array("%s" => $uname)), $block1);
+ if ($block1) $theme->box(strtr(t("%a's user information"), array("%a" => $uname)), $block1);
if ($block2) $theme->box(strtr(t("%a has posted %b recently"), array("%a" => $uname, "%b" => format_plural($comments, "comment", "comments"))), $block2);
module_iterate("module", $uname);
$theme->footer();
@@ -303,7 +303,7 @@ function account_validate($user) {
function account_email_submit($userid, $email) {
global $theme, $site_name, $site_url;
- $result = db_query("SELECT id FROM users WHERE userid = '". check_output($userid) ."' AND real_email = '". check_output($email) ."'");
+ $result = db_query("SELECT id FROM users WHERE userid = '". check_input($userid) ."' AND real_email = '". check_input($email) ."'");
if ($account = db_fetch_object($result)) {
$passwd = account_password();
@@ -313,11 +313,14 @@ function account_email_submit($userid, $email) {
db_query("UPDATE users SET passwd = PASSWORD('$passwd'), hash = '$hash', status = '$status' WHERE userid = '$userid'");
$link = $site_url ."account.php?op=confirm&name=$userid&hash=$hash";
- $message = "$userid,\n\n\nyou requested us to e-mail you a new password for your $site_name account. Note that you will need to re-activate your account before you can login. You can do so simply by visiting the URL below:\n\n $link\n\nVisiting this URL will automatically re-activate your account. Once activated you can login using the following information:\n\n username: $userid\n password: $passwd\n\n\n-- $site_name crew\n";
+ $subject = strtr(t("Account details for %a"), array("%a" => $site_name));
+ $message = strtr(t("%a,\n\n\nyou requested us to e-mail you a new password for your account at %b. You will need to re-confirm your account or you will not be able to login. To confirm your account updates visit the URL below:\n\n %c\n\nOnce confirmed you can login using the following username and password:\n\n username: %a\n password: %d\n\n\n-- %b team"), array("%a" => $userid, "%b" => $site_name, "%c" => $link, "%d" => $passwd));
+
+ print "<PRE>$subject<BR>$message</PRE>";
watchdog("message", "new password: `$userid' <$email>");
- mail($email, "Account details for $site_name", $message, "From: noreply");
+ mail($email, $subject, $message, "From: noreply");
$output = "Your password and further instructions have been sent to your e-mail address.";
}
@@ -350,14 +353,15 @@ function account_create_submit($userid, $email) {
user_save($new);
$link = $site_url ."account.php?op=confirm&name=$new[userid]&hash=$new[hash]";
- $message = "$new[userid],\n\n\nsomeone signed up for a user account on $site_name and supplied this email address as their contact. If it wasn't you, don't get your panties in a knot and simply ignore this mail.\n\nIf this was you, you have to activate your account first before you can login. You can do so simply by visiting the URL below:\n\n $link\n\nVisiting this URL will automatically activate your account. Once activated you can login using the following information:\n\n username: $new[userid]\n password: $new[passwd]\n\n\n-- $site_name crew\n";
+ $subject = strtr(t("Account details for %a"), array("%a" => $site_name));
+ $message = strtr(t("%a,\n\n\nsomeone signed up for a user account on %b and supplied this e-mail address as their contact. If it wasn't you, don't get your panties in a knot and simply ignore this mail. If this was you, you will have to confirm your account first or you will not be able to login. To confirm your account visit the URL below:\n\n %c\n\nOnce confirmed you can login using the following username and password:\n\n username: %a\n password: %d\n\n\n-- %b team\n"), array("%a" => $new[userid], "%b" => $site_name, "%c" => $link, "%d" => $new[passwd]));
watchdog("message", "new account: `$new[userid]' <$new[real_email]>");
- mail($new[real_email], "Account details for $site_name", $message, "From: noreply");
+ mail($new[real_email], $subject, $message, "From: noreply");
$theme->header();
- $theme->box(t("Create user account"), t("Congratulations! Your member account has been successfully created and further instructions on how to activate your account have been sent to your e-mail address."));
+ $theme->box(t("Create user account"), t("Congratulations! Your member account has been successfully created and further instructions on how to confirm your account have been sent to your e-mail address. You have to confirm your account first or you will not be able to login."));
$theme->footer();
}
}
diff --git a/database/database.mysql b/database/database.mysql
index e90fa0109cd9087d42dadec63cb8739728431dd7..009895c5127261edff8b5d05399ec9672abe99ef 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -111,6 +111,7 @@ CREATE TABLE layout (
CREATE TABLE locales (
id int(11) DEFAULT '0' NOT NULL auto_increment,
english TEXT DEFAULT '' NOT NULL,
+ location varchar(128) DEFAULT '' NOT NULL,
PRIMARY KEY (id)
);
@@ -176,7 +177,7 @@ CREATE TABLE watchdog (
timestamp int(11) DEFAULT '0' NOT NULL,
user int(6) DEFAULT '0' NOT NULL,
message varchar(255) DEFAULT '' NOT NULL,
- location varchar(255) DEFAULT '' NOT NULL,
+ location varchar(128) DEFAULT '' NOT NULL,
hostname varchar(128) DEFAULT '' NOT NULL,
PRIMARY KEY (id)
);
diff --git a/includes/locale.inc b/includes/locale.inc
index ab0a49eb5da361b444b46842923dfe8e08bc43c3..3e35bfd7018e5520c68e570b4ee029887e0afddf 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -2,7 +2,7 @@
function t($string) {
$result = db_query("SELECT id FROM locales WHERE english = '". addslashes($string) ."'");
- if (!db_fetch_object($result)) db_query("INSERT INTO locales (english) VALUES ('". addslashes($string) ."')");
+ if (!db_fetch_object($result)) db_query("INSERT INTO locales (english, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')");
return $string;
}
diff --git a/includes/user.inc b/includes/user.inc
index bdc62c3ce7ffa8870a1134ca2de967d05962a37b..9c4f38f668343a98fcb4c2adbf27cbb8181cdae7 100644
--- a/includes/user.inc
+++ b/includes/user.inc
@@ -1,17 +1,20 @@
<?
class User {
- function User($userid, $passwd) {
- $result = db_query("SELECT * FROM users WHERE LOWER(userid) = LOWER('$userid') && passwd = PASSWORD('$passwd') && STATUS = 2");
- if (db_num_rows($result) == 1) {
- foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; }
- db_query("UPDATE users SET last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_HOST]' WHERE id = $this->id");
+ function User($userid, $passwd = 0) {
+ if ($passwd) {
+ $result = db_query("SELECT * FROM users WHERE LOWER(userid) = LOWER('$userid') && passwd = PASSWORD('$passwd') && STATUS = 2");
+ if (db_num_rows($result) == 1) {
+ foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; }
+ db_query("UPDATE users SET last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_HOST]' WHERE id = $this->id");
+ }
}
- }
- function User($userid) {
- $result = db_query("SELECT * FROM users WHERE userid = '$userid' && STATUS = 2");
- if (db_num_rows($result) == 1) {
- foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; }
+ else {
+ $result = db_query("SELECT * FROM users WHERE userid = '$userid' && STATUS = 2");
+ if (db_num_rows($result) == 1) {
+ foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; }
+ db_query("UPDATE users SET last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_HOST]' WHERE id = $this->id");
+ }
}
}
}
diff --git a/modules/locale.module b/modules/locale.module
index 645769cd2eaba0f5f5536179246a24e77915ab4d..95594a65a6557e7517625d80645c5be6cb84660d 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -5,9 +5,13 @@
function locale() {
$result = db_query("SELECT * FROM locales ORDER BY english");
+ $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
+ $output .= " <TR><TH>string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
while ($locale = db_fetch_object($result)) {
- print "<LI>". check_output($locale->english) ."</LI>";
+ $output .= " <TR><TD>". check_output($locale->english) ."<BR><SMALL><I>$locale->location</I></SMALL></TD><TD><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\">edit</A></TD><TD><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\">delete</A></TD></TR>";
}
+ $output .= "</TABLE>\n";
+ print $output;
}
?>
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 645769cd2eaba0f5f5536179246a24e77915ab4d..95594a65a6557e7517625d80645c5be6cb84660d 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -5,9 +5,13 @@
function locale() {
$result = db_query("SELECT * FROM locales ORDER BY english");
+ $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
+ $output .= " <TR><TH>string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
while ($locale = db_fetch_object($result)) {
- print "<LI>". check_output($locale->english) ."</LI>";
+ $output .= " <TR><TD>". check_output($locale->english) ."<BR><SMALL><I>$locale->location</I></SMALL></TD><TD><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\">edit</A></TD><TD><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\">delete</A></TD></TR>";
}
+ $output .= "</TABLE>\n";
+ print $output;
}
?>
diff --git a/updates/1.00-to-1.xx b/updates/1.00-to-1.xx
index 8ef4971cf2a05fbebc68ebfa37ef97abe038c9cd..5d9b70e5a2921f27d02922c81e2821d87e66b95f 100644
--- a/updates/1.00-to-1.xx
+++ b/updates/1.00-to-1.xx
@@ -18,5 +18,6 @@ alter table users add rating decimal(8,4) DEFAULT '0' NOT NULL;
create table locales (
id int(11) DEFAULT '0' NOT NULL auto_increment,
english TEXT DEFAULT '' NOT NULL,
+ location varchar(128) DEFAULT '' NOT NULL,
PRIMARY KEY (id)
);