From dafa5ea67f13b10373066f1d49141c53bc25f1f9 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Fri, 11 Feb 2011 00:51:06 +0000
Subject: Move regexen now it's a variable

---
 gentoobrowse/checks/loggedIn.xml  | 3 +--
 gentoobrowse/request/dologin.xml  | 6 ++----
 gentoobrowse/request/dosignup.xml | 6 ++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gentoobrowse/checks/loggedIn.xml b/gentoobrowse/checks/loggedIn.xml
index 0785380..1f81797 100644
--- a/gentoobrowse/checks/loggedIn.xml
+++ b/gentoobrowse/checks/loggedIn.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<project2:regexcheck xmlns:project2="http://project2.randomdan.homeip.net" present="login" name="loggedIn">
+<project2:regexcheck xmlns:project2="http://project2.randomdan.homeip.net" present="login" name="loggedIn" regex="[1-9][0-9]*">
 	<apply-to source="session" name="loggedInUserID"><default value="" /></apply-to>
-	<regex>[1-9][0-9]*</regex>
 	<message>Not logged in</message> 
 </project2:regexcheck>
 
diff --git a/gentoobrowse/request/dologin.xml b/gentoobrowse/request/dologin.xml
index b2c7121..43ff3ce 100644
--- a/gentoobrowse/request/dologin.xml
+++ b/gentoobrowse/request/dologin.xml
@@ -3,14 +3,12 @@
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../datasources/postgres-web.xml" />
 	<xi:include href="../views/user.xml" />
-	<project2:regexcheck present="login" name="usernameEntered">
+	<project2:regexcheck present="login" name="usernameEntered" regex=".+">
 		<apply-to source="param" name="username" />
-		<regex>.+</regex>
 		<message>User name required</message> 
 	</project2:regexcheck>
-	<project2:regexcheck present="login" name="passwordLength">
+	<project2:regexcheck present="login" name="passwordLength" regex=".{6,}">
 		<apply-to source="param" name="password" />
-		<regex>.{6,}</regex>
 		<message>Password too short</message> 
 	</project2:regexcheck>
 	<project2:sqlcheck datasource="postgres-web" testOp="=" testValue="1" present="login" name="checkUserAuth">
diff --git a/gentoobrowse/request/dosignup.xml b/gentoobrowse/request/dosignup.xml
index cb0f1d1..d4b6711 100644
--- a/gentoobrowse/request/dosignup.xml
+++ b/gentoobrowse/request/dosignup.xml
@@ -2,14 +2,12 @@
 <view name="dosignup" present="confirm" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../datasources/postgres-web.xml" />
-	<project2:regexcheck present="signup" name="usernameEntered">
+	<project2:regexcheck present="signup" name="usernameEntered" regex=".+">
 		<apply-to source="param" name="username" />
-		<regex>.+</regex>
 		<message>User name required</message> 
 	</project2:regexcheck>
-	<project2:regexcheck present="signup" name="passwordLength">
+	<project2:regexcheck present="signup" name="passwordLength" regex=".{6,}">
 		<apply-to source="param" name="password" />
-		<regex>.{6,}</regex>
 		<message>Password too short</message> 
 	</project2:regexcheck>
 	<project2:sqlcheck datasource="postgres-web" testOp="=" testValue="0" present="signup" name="freeUsername">
-- 
cgit v1.2.3