diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin.module | 2 | ||||
| -rw-r--r-- | modules/profile.module | 1 | ||||
| -rw-r--r-- | modules/profile/profile.module | 1 | ||||
| -rw-r--r-- | modules/statistics.module | 16 | ||||
| -rw-r--r-- | modules/statistics/statistics.module | 16 | ||||
| -rw-r--r-- | modules/user.module | 4 | ||||
| -rw-r--r-- | modules/user/user.module | 4 |
7 files changed, 23 insertions, 21 deletions
diff --git a/modules/admin.module b/modules/admin.module index e72a30745..fa7b045c2 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 6abf5b439..8a59cfe0b 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 6abf5b439..8a59cfe0b 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 3cfd1ddb4..a897739d0 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 .= "<hr />"; - $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 .= "<hr />"; - $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 .= "<hr />"; - $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 .= "<hr />"; - $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 3cfd1ddb4..a897739d0 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 .= "<hr />"; - $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 .= "<hr />"; - $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 .= "<hr />"; - $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 .= "<hr />"; - $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 1b84b2255..000524eb4 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 .= "<p>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.</p>"; $output .= "<p>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.</p>"; - $output .= "<h3>User preferences and profiles</h3><p>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.</p>"; + $output .= "<h3>User preferences and profiles</h3><p>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.</p>"; $output .= "<p>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 <code>jabber_user()</code> function in <i>/modules/jabber.module</i>.</p>"; //end of user_help_admin diff --git a/modules/user/user.module b/modules/user/user.module index 1b84b2255..000524eb4 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 .= "<p>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.</p>"; $output .= "<p>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.</p>"; - $output .= "<h3>User preferences and profiles</h3><p>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.</p>"; + $output .= "<h3>User preferences and profiles</h3><p>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.</p>"; $output .= "<p>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 <code>jabber_user()</code> function in <i>/modules/jabber.module</i>.</p>"; //end of user_help_admin |