From 02f437a2f48ea4d38998e092412801e99e1acc52 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 13 Apr 2003 13:42:51 +0000
Subject: - Renamed 'validate_email_address' to 'valid_email_address'.

- Added a 'form_radio' function.
---
 includes/common.inc      | 6 +++++-
 modules/user.module      | 2 +-
 modules/user/user.module | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/includes/common.inc b/includes/common.inc
index 51138cb3a..bbf857bb9 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -261,7 +261,7 @@ function table($header, $rows) {
  *
  * @param $mail  a email address
  */
-function validate_email_address($mail) {
+function valid_email_address($mail) {
   $user = '[a-zA-Z0-9_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\']+';
   $domain = '(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]\.?)+';
   $ipv4 = '[0-9]{1,3}(\.[0-9]{1,3}){3}';
@@ -767,6 +767,10 @@ function form_item($title, $value, $description = 0) {
   return "<p>". ($title ? "<b>$title:</b><br />" : "") . $value . ($description ? "<br /><small><i>$description</i></small>" : "") ."</p>\n";
 }
 
+function form_radio($title, $name, $value = 1, $checked = 0, $description = 0) {
+  return form_item(0, "<input type=\"radio\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") ." /> $title", $description);
+}
+
 function form_checkbox($title, $name, $value = 1, $checked = 0, $description = 0) {
   return form_hidden($name, 0) . form_item(0, "<input type=\"checkbox\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") ." /> $title", $description);
 }
diff --git a/modules/user.module b/modules/user.module
index b8c3e5869..71386c52f 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -182,7 +182,7 @@ function user_validate_name($name) {
 
 function user_validate_mail($mail) {
 
-  if ($mail && !validate_email_address($mail)) {
+  if ($mail && !valid_email_address($mail)) {
     return t("The e-mail address '%mail' is not valid.", array("%mail" => $mail));
   }
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index b8c3e5869..71386c52f 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -182,7 +182,7 @@ function user_validate_name($name) {
 
 function user_validate_mail($mail) {
 
-  if ($mail && !validate_email_address($mail)) {
+  if ($mail && !valid_email_address($mail)) {
     return t("The e-mail address '%mail' is not valid.", array("%mail" => $mail));
   }
 }
-- 
cgit v1.2.3