--- phpMyEdit.class.php	2004-01-16 21:40:21.709057600 +0100
+++ phpMyEdit.class.jsvalid2.php	2004-01-16 22:53:01.558212800 +0100
@@ -687,12 +687,6 @@
 
 	function form_begin() /* {{{ */
 	{
-		/*
-		   Need a lot of work in here
-		   using something like:
-		   $fdd['fieldname']['validate']['js_regex']='/something/';
-		   $fdd['fieldname']['validate']['php_regex']='something';
-		 */
 		$page_name = htmlspecialchars($this->page_name);
 
 		if ($this->add_operation() || $this->change_operation() || $this->copy_operation()
@@ -750,20 +744,14 @@
 		}
 
 		if ($this->add_operation() || $this->change_operation() || $this->copy_operation()) {
-			$required_ar = array();
+			$first_required = true;
 			for ($k = 0; $k < $this->num_fds; $k++) {
-				if ($this->displayed[$k] && $this->fdd[$k]['required']
+				if ($this->displayed[$k] && ( $this->fdd[$k]['required'] || isset($this->fdd[$k]['js']['regex']) )
 						&& ! $this->readonly($k) && ! $this->hidden($k)) {
-					$required_ar[] = $k;
-					if (isset($this->fdd[$k]['regex']['js'])) {
-						/* TODO: Use a javascript regex to validate it */
-					}
-				}
-			}
 
-			if (count($required_ar) > 0) {
-				echo '<script type="text/javascript"><!--',"\n";
-				echo '
+					if ($first_required) {
+						echo '<script type="text/javascript"><!--',"\n";
+						echo '
 function phpMyEdit_trim(str)
 {
 	while (str.substring(0, 1) == " "
@@ -783,13 +771,21 @@
 
 function phpMyEdit_form_control(theForm)
 {',"\n";
-				foreach ($required_ar as $field_num) {
-					if ($this->col_has_values($field_num)) {
-						$condition = 'theForm.%s.selectedIndex == -1';
-						$multiple  = $this->col_has_multiple_select($field_num);
+				 		$first_required = false;
+					}
+					if ($this->col_has_values($k)) {
+						$condition = 'theForm.'.$this->fds[$k].'.selectedIndex == -1';
+						$multiple  = $this->col_has_multiple_select($k);
 					} else {
-						$condition = 'phpMyEdit_trim(theForm.%s.value) == ""';
+						$condition = '';
 						$multiple  = false;
+						if ($this->fdd[$k]['required']) {
+							$condition = 'phpMyEdit_trim(theForm.'.$this->fds[$k].'.value) == ""';
+						}
+						if (isset($this->fdd[$k]['js']['regex'])) {
+							$condition .= ($condition != '') ? ' || ' : '';
+							$condition .= '!('.$this->fdd[$k]['js']['regex'].'.test(phpMyEdit_trim(theForm.'.$this->fds[$k].'.value)))';
+						}
 					}
 
 					/* Multiple selects have their name like ``name[]''.
@@ -802,39 +798,34 @@
 						echo '
 	multiple_select = null;
 	for (i = 0; i < theForm.length; i++) {
-		if (theForm.elements[i].name == "',$this->fds[$field_num],'[]") {
+		if (theForm.elements[i].name == "',$this->fds[$k],'[]") {
 			multiple_select = theForm.elements[i];
 			break;
 		}
 	}
-	if (multiple_select != null && multiple_select.selectedIndex == -1) {
-		alert("',$this->labels['Please enter'],' ',$this->fdd[$field_num]['name'],'.");';
-						if ($this->tabs_enabled()) {
-							echo '
-		phpMyEdit_show_tab("phpMyEdit_tab"+phpMyEdit_field_to_tab['.$field_num.']);';
-						}
-						echo '
-		return false;
-	}',"\n";
+	if (multiple_select != null && multiple_select.selectedIndex == -1) {';
 					} else {
 						echo '
-	if (',sprintf($condition, $this->fds[$field_num]),') {
-		alert("',$this->labels['Please enter'],' ',$this->fdd[$field_num]['name'],'.");';
-						if ($this->tabs_enabled()) {
-							echo '
-		phpMyEdit_show_tab("phpMyEdit_tab"+phpMyEdit_field_to_tab['.$field_num.']);';
-						}
+	if (',$condition,') {';
+					}
+					echo '
+		alert("',$this->labels['Please enter'],' ',$this->fdd[$k]['name'],'.';
+					echo isset($this->fdd[$k]['js']['hint']) ? '\n'.$this->fdd[$k]['js']['hint'] : "";
+					echo '");';
+					if ($this->tabs_enabled()) {
 						echo '
-		theForm.',$this->fds[$field_num],'.focus();
+		phpMyEdit_show_tab("phpMyEdit_tab"+phpMyEdit_field_to_tab['.$k.']);';
+					}
+					echo '
+		theForm.',$this->fds[$k],'.focus();
 		return false;
 	}',"\n";
-					}
 				}
+			}
 				echo '
 	return true;
 }',"\n\n";
 				echo '// --></script>', "\n";
-			}
 		}
 
 		if ($this->filter_operation()) {