Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Applied Alexander Schwartz's patches on the Drupal 3.00 branch.

3.0.x
Dries Buytaert 2001-09-18 18:34:54 +00:00
parent b1b32561a2
commit cd771f66b2
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
account.php
View File

@ -333,16 +333,16 @@ function account_create_submit($edit) {
$theme->box(t("Create user account"), account_create_form($edit, $error));
}
else if ($ban = user_ban($edit[login], "username")) {
$theme->box(t("Create user account"), account_create_form($edit, t("the username '$edit[login]' is banned") .": <i>$ban->reason</i>."));
$theme->box(t("Create user account"), account_create_form($edit, strtr(t("the username '%a' is banned"), array("%a" => $edit[login])) .": <i>$ban->reason</i>."));
}
else if ($ban = user_ban($edit[real_email], "e-mail address")) {
$theme->box(t("Create user account"), account_create_form($edit, t("the username '$edit[email]' is banned") .": <i>$ban->reason</i>."));
$theme->box(t("Create user account"), account_create_form($edit, strtr(t("the e-mail '%a' is banned"), array("%a" => $edit[email])) .": <i>$ban->reason</i>."));
}
else if (db_num_rows(db_query("SELECT userid FROM users WHERE (LOWER(userid) = LOWER('$edit[login]') OR LOWER(name) = LOWER('$edit[login]'))")) > 0) {
$theme->box(t("Create user account"), account_create_form($edit, t("the username '$edit[login]' is already taken.")));
$theme->box(t("Create user account"), account_create_form($edit, strtr(t("the username '%a' is already taken."), array("%a" => $edit[login]))));
}
else if (db_num_rows(db_query("SELECT real_email FROM users WHERE LOWER(real_email) = LOWER('$edit[email]')")) > 0) {
$theme->box(t("Create user account"), account_create_form($edit, t("the e-mail address '$edit[email]' is already in use by another account.")));
$theme->box(t("Create user account"), account_create_form($edit, strtr(t("the e-mail address '%a' is already in use by another account."),array("%a" => $edit[email]))));
}
else {
@ -517,7 +517,12 @@ switch ($op) {
break;
case "login":
account_session_start(check_input($userid), check_input($passwd));
header("Location: account.php?op=info");
if($HTTP_REFERER <> "") {
header("Location: $HTTP_REFERER");
}
else {
header("Location: account.php?op=info");
}
break;
case "logout":
account_session_close();

2
index.php
View File

@ -14,7 +14,7 @@ if (user_access("access content")) {
}
}
else {
$theme->box("Access denied", message_access());
$theme->box(t("Access denied"), message_access());
}
$theme->footer();

4
modules/search.module
View File

@ -6,7 +6,7 @@ function search_perm() {
function search_link($type) {
if ($type == "page" && user_access("search content")) {
$links[] = "<a href=\"module.php?mod=search\">search</a>";
$links[] = "<a href=\"module.php?mod=search\">". t("search") ."</a>";
}
return $links ? $links : array();
@ -49,7 +49,7 @@ function search_page() {
}
else {
$theme->header();
$theme->box("Access denied", message_access());
$theme->box(t("Access denied"), message_access());
$theme->footer();
}
}

2
submit.php
View File

@ -24,7 +24,7 @@ if (user_access("post content")) {
}
}
else {
$theme->box("Submit", message_access());
$theme->box(t("Submit"), message_access());
}
$theme->footer();