diff --git a/database/database.mssql b/database/database.mssql
index f61911f0b77f5f86679dc7e4735ecd7ba5c4ccfb..663697e2c6636300fe810671cc6c61a8478cd3e3 100644
--- a/database/database.mssql
+++ b/database/database.mssql
@@ -353,7 +353,6 @@ CREATE TABLE [dbo].[users] (
[name] [varchar] (60) NOT NULL ,
[pass] [varchar] (32) NOT NULL ,
[mail] [varchar] (64) NULL ,
- [homepage] [varchar] (128) NULL ,
[mode] [smallint] NOT NULL ,
[sort] [smallint] NULL ,
[threshold] [smallint] NULL ,
@@ -517,4 +516,4 @@ BEGIN
RETURN @a;
END
RETURN @b;
-END
\ No newline at end of file
+END
diff --git a/database/database.mysql b/database/database.mysql
index 3f262af343b87e22a6630b4cb3fd508c3bdd8953..ef50763558127085362a66cef41eadd778b69748 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -515,7 +515,6 @@ CREATE TABLE users (
name varchar(60) NOT NULL default '',
pass varchar(32) NOT NULL default '',
mail varchar(64) default '',
- homepage varchar(128) NOT NULL default '',
mode tinyint(1) NOT NULL default '0',
sort tinyint(1) default '0',
threshold tinyint(1) default '0',
diff --git a/database/database.pgsql b/database/database.pgsql
index fd1ef5f862e20fbc0c6a5777865020b0f93565fa..cba2ca5db2f296070972ec354c74de6dc58802cf 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -514,7 +514,6 @@ CREATE TABLE users (
name varchar(60) NOT NULL default '',
pass varchar(32) NOT NULL default '',
mail varchar(64) default '',
- homepage varchar(128) NOT NULL default '',
mode smallint NOT NULL default '0',
sort smallint default '0',
threshold smallint default '0',
diff --git a/modules/admin.module b/modules/admin.module
index e72a30745e669d4a66d781900d5b3f8da2c50ec1..fa7b045c2f76fd3c614531731188c64594d91357 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -28,7 +28,7 @@ function admin_help($section) {
function admin_link($type) {
if ($type == "system" && user_access("access administration pages")) {
- menu("admin", t("administer"), NULL, 9);
+ menu("admin", t("administer"), "admin_admin", 9);
}
}
diff --git a/modules/profile.module b/modules/profile.module
index 6abf5b439e8763e54ae6c623ce1eb8daaa1f5902..8a59cfe0b2711110145a1c02ff0544f622150688 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -9,6 +9,7 @@ function _profile_init() {
*/
$GLOBALS["profile_fields"] = array(
+ "realname" => array("textfield", t("Name"), "", 64, 64, ""),
"address" => array("textfield", t("Address"), "", 64, 64, ""),
"city" => array("textfield", t("City"), "", 64, 64, ""),
"state" => array("textfield", t("State, province or region"), "", 64, 64, ""),
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 6abf5b439e8763e54ae6c623ce1eb8daaa1f5902..8a59cfe0b2711110145a1c02ff0544f622150688 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -9,6 +9,7 @@ function _profile_init() {
*/
$GLOBALS["profile_fields"] = array(
+ "realname" => array("textfield", t("Name"), "", 64, 64, ""),
"address" => array("textfield", t("Address"), "", 64, 64, ""),
"city" => array("textfield", t("City"), "", 64, 64, ""),
"state" => array("textfield", t("State, province or region"), "", 64, 64, ""),
diff --git a/modules/statistics.module b/modules/statistics.module
index 3cfd1ddb433a1f26706a9d208144ebb9cdb50db5..a897739d07bf49a4aab3bfb6d2fc39480a201bf0 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -266,13 +266,13 @@ function statistics_admin() {
/* configuration admin pages */
if (user_access("administer statistics module")) {
switch (stripslashes($op)) {
- case "Submit \"top nodes\" block changes":
+ case t("Submit \"top nodes\" block changes"):
statistics_save_topnodes_block($edit);
$output .= status(t("saved 'top nodes' block changes."));
- case "Submit \"who's online\" block changes":
+ case t("Submit \"who's online\" block changes"):
statistics_save_online_block($edit);
$output .= status(t("saved 'who's online' block changes."));
- case "Submit \"top nodes\" page changes":
+ case t("Submit \"top nodes\" page changes"):
statistics_save_userconfig($edit);
$output .= status(t("saved 'top nodes' page changes."));
case "top nodes page":
@@ -504,7 +504,7 @@ function statistics_config_topnodes_block($edit) {
$form .= "
";
- $form .= form_submit("Submit \"top nodes\" block changes");
+ $form .= form_submit(t("Submit \"top nodes\" block changes"));
return form($form);
}
@@ -521,7 +521,7 @@ function statistics_config_online_block($edit) {
$form .= form_select(t("Maximum characters of user's name to display"), "statistics_block_online_max_len", $edit["statistics_block_online_max_len"], array("1" => "1", "5" => "5", "10" => "10", "15" => "15", "20" => "20", "25" => "25", "30" => "30", "35" => "35", "40" => "40", "45" => "45", "50" => "50", "55" => "55", "60" => "60"), t("What is the maximum characters of a user's name to to display in the sub-block."));
$form .= form_select(t("How many online users to list"), "statistics_block_online_max_cnt", $edit["statistics_block_online_max_cnt"], array("0" => "0", "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "50" => "50", "100" => "100"), t("How many online user's names to display in the sub-block."));
- $form .= form_submit("Submit \"who's online\" block changes");
+ $form .= form_submit(t("Submit \"who's online\" block changes"));
return form($form);
}
@@ -537,15 +537,15 @@ function statistics_admin_userpage_config($edit) {
$form .= form_select(t("Number of nodes to display for \"day's top\""), "statistics_userpage_day_cnt", $edit["statistics_userpage_day_cnt"], array("0" => t("Disabled"), "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "25" => "25"), t("Set how many \"day's top\" nodes to display on the user page generated by this module."));
$form .= "
";
- $form .= form_textfield(t("All time top nodes title"), "statistics_userpage_all_head", $edit["statistics_userpage_all_head"], 20, 40, "Specify a name for the \"all time top\" section of the user page generated by this module.");
+ $form .= form_textfield(t("All time top nodes title"), "statistics_userpage_all_head", $edit["statistics_userpage_all_head"], 20, 40, t("Specify a name for the \"all time top\" section of the user page generated by this module."));
$form .= form_select(t("Number of nodes to display for \"all time\""), "statistics_userpage_all_cnt", $edit["statistics_userpage_all_cnt"], array("0" => t("Disabled"), "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "25" => "25"), t("Set how many \"all time top\" nodes to display on the user page generated by this module."));
$form .= "
";
- $form .= form_textfield(t("Last viewed nodes title"), "statistics_userpage_last_head", $edit["statistics_userpage_last_head"], 20, 40, "Specify a name for the \"last viewed\" section of the user page generated by this module.");
+ $form .= form_textfield(t("Last viewed nodes title"), "statistics_userpage_last_head", $edit["statistics_userpage_last_head"], 20, 40, t("Specify a name for the \"last viewed\" section of the user page generated by this module."));
$form .= form_select(t("Number of nodes to display for \"last views\""), "statistics_userpage_last_cnt", $edit["statistics_userpage_last_cnt"], array("0" => t("Disabled"), "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "25" => "25"), t("Set how many \"last viewed\" nodes to display on the user page generated by this module."));
$form .= "
";
- $form .= form_submit("Submit \"top nodes\" page changes");
+ $form .= form_submit(t("Submit \"top nodes\" page changes"));
return form($form);
}
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 3cfd1ddb433a1f26706a9d208144ebb9cdb50db5..a897739d07bf49a4aab3bfb6d2fc39480a201bf0 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -266,13 +266,13 @@ function statistics_admin() {
/* configuration admin pages */
if (user_access("administer statistics module")) {
switch (stripslashes($op)) {
- case "Submit \"top nodes\" block changes":
+ case t("Submit \"top nodes\" block changes"):
statistics_save_topnodes_block($edit);
$output .= status(t("saved 'top nodes' block changes."));
- case "Submit \"who's online\" block changes":
+ case t("Submit \"who's online\" block changes"):
statistics_save_online_block($edit);
$output .= status(t("saved 'who's online' block changes."));
- case "Submit \"top nodes\" page changes":
+ case t("Submit \"top nodes\" page changes"):
statistics_save_userconfig($edit);
$output .= status(t("saved 'top nodes' page changes."));
case "top nodes page":
@@ -504,7 +504,7 @@ function statistics_config_topnodes_block($edit) {
$form .= "
";
- $form .= form_submit("Submit \"top nodes\" block changes");
+ $form .= form_submit(t("Submit \"top nodes\" block changes"));
return form($form);
}
@@ -521,7 +521,7 @@ function statistics_config_online_block($edit) {
$form .= form_select(t("Maximum characters of user's name to display"), "statistics_block_online_max_len", $edit["statistics_block_online_max_len"], array("1" => "1", "5" => "5", "10" => "10", "15" => "15", "20" => "20", "25" => "25", "30" => "30", "35" => "35", "40" => "40", "45" => "45", "50" => "50", "55" => "55", "60" => "60"), t("What is the maximum characters of a user's name to to display in the sub-block."));
$form .= form_select(t("How many online users to list"), "statistics_block_online_max_cnt", $edit["statistics_block_online_max_cnt"], array("0" => "0", "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "50" => "50", "100" => "100"), t("How many online user's names to display in the sub-block."));
- $form .= form_submit("Submit \"who's online\" block changes");
+ $form .= form_submit(t("Submit \"who's online\" block changes"));
return form($form);
}
@@ -537,15 +537,15 @@ function statistics_admin_userpage_config($edit) {
$form .= form_select(t("Number of nodes to display for \"day's top\""), "statistics_userpage_day_cnt", $edit["statistics_userpage_day_cnt"], array("0" => t("Disabled"), "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "25" => "25"), t("Set how many \"day's top\" nodes to display on the user page generated by this module."));
$form .= "
";
- $form .= form_textfield(t("All time top nodes title"), "statistics_userpage_all_head", $edit["statistics_userpage_all_head"], 20, 40, "Specify a name for the \"all time top\" section of the user page generated by this module.");
+ $form .= form_textfield(t("All time top nodes title"), "statistics_userpage_all_head", $edit["statistics_userpage_all_head"], 20, 40, t("Specify a name for the \"all time top\" section of the user page generated by this module."));
$form .= form_select(t("Number of nodes to display for \"all time\""), "statistics_userpage_all_cnt", $edit["statistics_userpage_all_cnt"], array("0" => t("Disabled"), "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "25" => "25"), t("Set how many \"all time top\" nodes to display on the user page generated by this module."));
$form .= "
";
- $form .= form_textfield(t("Last viewed nodes title"), "statistics_userpage_last_head", $edit["statistics_userpage_last_head"], 20, 40, "Specify a name for the \"last viewed\" section of the user page generated by this module.");
+ $form .= form_textfield(t("Last viewed nodes title"), "statistics_userpage_last_head", $edit["statistics_userpage_last_head"], 20, 40, t("Specify a name for the \"last viewed\" section of the user page generated by this module."));
$form .= form_select(t("Number of nodes to display for \"last views\""), "statistics_userpage_last_cnt", $edit["statistics_userpage_last_cnt"], array("0" => t("Disabled"), "1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "15" => "15", "20" => "20", "25" => "25"), t("Set how many \"last viewed\" nodes to display on the user page generated by this module."));
$form .= "
";
- $form .= form_submit("Submit \"top nodes\" page changes");
+ $form .= form_submit(t("Submit \"top nodes\" page changes"));
return form($form);
}
diff --git a/modules/user.module b/modules/user.module
index 1b84b2255b2e98fa5fa6509335a0929fce196bbe..000524eb478f5e2c92a66d11c4962e48a5e4f36b 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -369,7 +369,7 @@ function user_fields() {
}
// Make sure we return the default fields at least
- return is_array($fields) ? $fields: array("uid", "name", "pass", "mail", "homepage", "mode", "sort", "threshold", "theme", "signature", "timestamp", "status", "timezone", "language", "init", "data", "rid");
+ return is_array($fields) ? $fields: array("uid", "name", "pass", "mail", "mode", "sort", "threshold", "theme", "signature", "timestamp", "status", "timezone", "language", "init", "data", "rid");
}
/*** Module hooks **********************************************************/
@@ -1772,7 +1772,7 @@ function user_help($section = "admin/help#user") {
$output .= "In contrast, those with a user account can use their own name or handle and are granted various privileges: the most important is probably the ability to moderate new submissions, to rate comments, and to fine-tune the site to their personal liking, with saved personal settings. Drupal themes make fine tuning quite a pleasure.
";
$output .= "Registered users need to authenticate by supplying either a local username and password, or a remote username and password such as a %jabber, %delphiforums, or one from another %drupal website. See %da-auth for more information on this innovative feature.";
$output .= "The local username and password, hashed with Message Digest 5 (MD5), are stored in your database. When you enter a password it is also hashed with MD5 and compaired with what is in the database. If the hashes match, the username and password are correct. Once a user authenticated session is started, and until that session is over, the user won't have to re-authenticate. To keep track of the individual sessions, Drupal relies on %php-sess. A visitor accessing your website is assigned an unique ID, the so-called session ID, which is stored in a cookie. For security's sake, the cookie does not contain personal information but acts as a key to retrieve the information stored on your server. When a visitor accesses your site, Drupal will check whether a specific session ID has been sent with the request. If this is the case, the prior saved environment is recreated.
";
- $output .= "User preferences and profiles
Each Drupal user has a profile, and a set of preferences which may be edited by clicking on the %user-prefs link. Of course, a user must be logged into reach those pages. There, users will find a page for changing their preferred time zone, language, username, e-mail address, password, theme, signature, homepage, and %da-auth names. Changes made here take effect immediately. Also, administrators may make profile and preferences changes in %admin-user on behalf of their users.
";
+ $output .= "User preferences and profiles
Each Drupal user has a profile, and a set of preferences which may be edited by clicking on the %user-prefs link. Of course, a user must be logged into reach those pages. There, users will find a page for changing their preferred time zone, language, username, e-mail address, password, theme, signature, and %da-auth names. Changes made here take effect immediately. Also, administrators may make profile and preferences changes in %admin-user on behalf of their users.
";
$output .= "Module developers are provided several hooks for adding custom fields to the user view/edit pages. These hooks are described in the Developer section of the %da-devel. For an example, see the jabber_user() function in /modules/jabber.module.
";
//end of user_help_admin
diff --git a/modules/user/user.module b/modules/user/user.module
index 1b84b2255b2e98fa5fa6509335a0929fce196bbe..000524eb478f5e2c92a66d11c4962e48a5e4f36b 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -369,7 +369,7 @@ function user_fields() {
}
// Make sure we return the default fields at least
- return is_array($fields) ? $fields: array("uid", "name", "pass", "mail", "homepage", "mode", "sort", "threshold", "theme", "signature", "timestamp", "status", "timezone", "language", "init", "data", "rid");
+ return is_array($fields) ? $fields: array("uid", "name", "pass", "mail", "mode", "sort", "threshold", "theme", "signature", "timestamp", "status", "timezone", "language", "init", "data", "rid");
}
/*** Module hooks **********************************************************/
@@ -1772,7 +1772,7 @@ function user_help($section = "admin/help#user") {
$output .= "In contrast, those with a user account can use their own name or handle and are granted various privileges: the most important is probably the ability to moderate new submissions, to rate comments, and to fine-tune the site to their personal liking, with saved personal settings. Drupal themes make fine tuning quite a pleasure.
";
$output .= "Registered users need to authenticate by supplying either a local username and password, or a remote username and password such as a %jabber, %delphiforums, or one from another %drupal website. See %da-auth for more information on this innovative feature.";
$output .= "The local username and password, hashed with Message Digest 5 (MD5), are stored in your database. When you enter a password it is also hashed with MD5 and compaired with what is in the database. If the hashes match, the username and password are correct. Once a user authenticated session is started, and until that session is over, the user won't have to re-authenticate. To keep track of the individual sessions, Drupal relies on %php-sess. A visitor accessing your website is assigned an unique ID, the so-called session ID, which is stored in a cookie. For security's sake, the cookie does not contain personal information but acts as a key to retrieve the information stored on your server. When a visitor accesses your site, Drupal will check whether a specific session ID has been sent with the request. If this is the case, the prior saved environment is recreated.
";
- $output .= "User preferences and profiles
Each Drupal user has a profile, and a set of preferences which may be edited by clicking on the %user-prefs link. Of course, a user must be logged into reach those pages. There, users will find a page for changing their preferred time zone, language, username, e-mail address, password, theme, signature, homepage, and %da-auth names. Changes made here take effect immediately. Also, administrators may make profile and preferences changes in %admin-user on behalf of their users.
";
+ $output .= "User preferences and profiles
Each Drupal user has a profile, and a set of preferences which may be edited by clicking on the %user-prefs link. Of course, a user must be logged into reach those pages. There, users will find a page for changing their preferred time zone, language, username, e-mail address, password, theme, signature, and %da-auth names. Changes made here take effect immediately. Also, administrators may make profile and preferences changes in %admin-user on behalf of their users.
";
$output .= "Module developers are provided several hooks for adding custom fields to the user view/edit pages. These hooks are described in the Developer section of the %da-devel. For an example, see the jabber_user() function in /modules/jabber.module.
";
//end of user_help_admin
diff --git a/update.php b/update.php
index 4f2c27fd2d9c94f1dc8837334a9b054486b65f68..42fd1efdc31d9fc75aa9b2cf23c5feffb05275dd 100644
--- a/update.php
+++ b/update.php
@@ -55,7 +55,8 @@
"2003-09-09" => "update_63",
"2003-09-10" => "update_64",
"2003-09-29" => "update_65",
- "2003-09-30" => "update_66"
+ "2003-09-30" => "update_66",
+ "2003-10-11" => "update_67"
);
function update_32() {
@@ -502,6 +503,10 @@ function update_66() {
}
}
+function update_67() {
+ update_sql("ALTER TABLE users DROP homepage");
+}
+
/*
** System functions
*/