From fe850f87373bdb3a28976c6525c369b9652a52ef Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 6 Jul 2004 08:24:17 +0000
Subject: [PATCH] adding 2 free fields that can be used for sorting purposes

---
 .../default/en/members/jmemberentry.tmpl      | 200 ++++++++++--------
 .../default/en/members/memberentry.tmpl       |  15 +-
 .../default/en/members/moremember.tmpl        | 118 ++++++-----
 .../default/en/members/newjmember.tmpl        | 166 +++++++--------
 members/insertjdata.pl                        |   6 +-
 members/memberentry.pl                        |   8 +-
 updater/updatedatabase                        |  17 +-
 7 files changed, 284 insertions(+), 246 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
index 681737f819..62790d00f8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
@@ -1,97 +1,109 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
-
-<h1>Add New Junior Member </h1><br>
-<form action=/cgi-bin/koha/members/newjmember.pl method=post>
-	<!--<input type=hidden name=joining value="">
-	<input type=hidden name=expiry value="">
-	<input type=hidden name=type value="borrowers">-->
-	<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-	<input type=hidden name=updtype value=I>
-	<input type=hidden name=area value="<!-- TMPL_VAR NAME=area -->">
-	<input type=hidden name=city value="<!-- TMPL_VAR NAME=city -->">
-	<input type=hidden name=physstreet value="<!-- TMPL_VAR NAME=physstreet -->">
-	<input type=hidden name=streetaddress value="<!-- TMPL_VAR NAME=streetaddress -->">
-	<input type=hidden name=streetcity value="<!-- TMPL_VAR NAME=streetcity -->">
-	<input type=hidden name=phone value="<!-- TMPL_VAR NAME=phone -->">
-	<input type=hidden name=phoneday value="<!-- TMPL_VAR NAME=phoneday -->">
-	<input type=hidden name=faxnumber value="<!-- TMPL_VAR NAME=faxnumber -->">
-	<input type=hidden name=emailaddress value="<!-- TMPL_VAR NAME=emailaddress -->">
-	<input type=hidden name=contactname value="<!-- TMPL_VAR NAME=contactname -->">
-	<input type=hidden name=altphone value"<!-- TMPL_VAR NAME=altphone -->">
-
-	<table border=0 cellspacing=0 cellpadding=5 >
-	<tr valign=top bgcolor="99cc33" >
-		<td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-			<B>PARENT OR GUARDIAN </b>
-		</td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td>
-		<SELECT NAME="title" SIZE="1">
-			<OPTION value=" ">No Title
-			<!-- TMPL_LOOP NAME=titleloop -->
-			<OPTION value="<!-- TMPL_VAR NAME=title -->" <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=title -->
-			<!-- /TMPL_LOOP -->
-		</SELECT>
-		</td>
-		<td><input type=text name=firstname_guardian size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
-		<td colspan=2><input type=text name=surname_guardian size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
-		<td><input type=text name=guardian_number size=20 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Salutation</FONT></td>
-		<td><FONT SIZE=2>Given Names*</FONT></td>
-		<td colspan=2><FONT SIZE=2>Surname*</FONT></td>
-		<td><FONT SIZE=2>Membership No.</FONT></td>
-	</tr>
-	<!-- TMPL_LOOP NAME=cmemloop -->
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-			<B>CHILD <!-- TMPL_VAR NAME=count --></b>
-		</td>
-	</TR>
-	<TR>
-		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
-			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card number*</b></STRONG>
-		</TD>
-		<TD>
-			<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
-			<input type=hidden name=bornumber_child_<!-- TMPL_VAR NAME=i --> value="<!-- TMPL_VAR NAME=cmember -->">
-		</td>
-	</TR>
-	<tr bgcolor=white>
-		<td><input type=text name=firstname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
-		<td><input type=text name=surname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
-		<td><input type=text name=dateofbirth_child_<!-- TMPL_VAR NAME=i --> size=10 value=""></TD>
-		<TD>
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>F</b>
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>M*</b>
-		</td>
-		<TD align=right><input type=text name=school_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></TD>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2><b>Given Name*</b></FONT></td>
-		<td><FONT SIZE=2><b>Surname*</b></FONT></td>
-		<td><FONT SIZE=2><b>Date of Birth<BR>(<!-- TMPL_VAR NAME=dateformat -->)*</b></FONT></td>
-		<td><FONT SIZE=2>&nbsp;</FONT></td>
-		<td><FONT SIZE=2>School</FONT></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td  COLSPAN=5><textarea name=altnotes_child_<!-- TMPL_VAR NAME=i --> wrap=physical cols=70 rows=3></textarea></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Notes</font></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	<tr valign=top bgcolor=white>
-		<td colspan=2 align="center"><input type=reset value="Clear all Fields"></td>
-		<td  COLSPAN=3 align="center">
-			<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" ALT="Add New Member" border=0>
-		</td>
-	</tr>
-
-	</TABLE>
-</form>
-
+<div id="mainbloc">
+	<h1>Add New Junior Member </h1><br>
+	<form action=/cgi-bin/koha/members/newjmember.pl method=post>
+		<!--<input type=hidden name=joining value="">
+		<input type=hidden name=expiry value="">
+		<input type=hidden name=type value="borrowers">-->
+		<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
+		<input type=hidden name=updtype value=I>
+		<input type=hidden name=area value="<!-- TMPL_VAR NAME=area -->">
+		<input type=hidden name=city value="<!-- TMPL_VAR NAME=city -->">
+		<input type=hidden name=physstreet value="<!-- TMPL_VAR NAME=physstreet -->">
+		<input type=hidden name=streetaddress value="<!-- TMPL_VAR NAME=streetaddress -->">
+		<input type=hidden name=streetcity value="<!-- TMPL_VAR NAME=streetcity -->">
+		<input type=hidden name=phone value="<!-- TMPL_VAR NAME=phone -->">
+		<input type=hidden name=phoneday value="<!-- TMPL_VAR NAME=phoneday -->">
+		<input type=hidden name=faxnumber value="<!-- TMPL_VAR NAME=faxnumber -->">
+		<input type=hidden name=emailaddress value="<!-- TMPL_VAR NAME=emailaddress -->">
+		<input type=hidden name=contactname value="<!-- TMPL_VAR NAME=contactname -->">
+		<input type=hidden name=altphone value"<!-- TMPL_VAR NAME=altphone -->">
+	
+		<table border=0 cellspacing=0 cellpadding=5 >
+		<tr>
+			<th  colspan=5>
+				PARENT OR GUARDIAN 
+			</th>
+		</tr>
+		<tr valign=top bgcolor=white>
+			<td>Salutation</td>
+			<td>Given Names*</td>
+			<td colspan=2>Surname*</td>
+			<td>Membership No.</td>
+		</tr>
+		<tr>
+			<td>
+				<select NAME="title" SIZE="1">
+					<option value=" ">No Title
+					<!-- TMPL_LOOP NAME=titleloop -->
+					<option value="<!-- TMPL_VAR NAME=title -->" <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=title -->
+					<!-- /TMPL_LOOP -->
+				</select>
+			</td>
+			<td><input type=text name=firstname_guardian size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
+			<td colspan=2><input type=text name=surname_guardian size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
+			<td><input type=text name=guardian_number size=20 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
+		</tr>
+		<!-- TMPL_LOOP NAME=cmemloop -->
+		<tr>
+			<tH colspan=5>
+				CHILD <!-- TMPL_VAR NAME=count -->
+			</tH>
+		</TR>
+		<TR>
+			<td colspan=5>
+				Member# <!-- TMPL_VAR NAME=cmember -->, Card number*
+				<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
+				<input type=hidden name=bornumber_child_<!-- TMPL_VAR NAME=i --> value="<!-- TMPL_VAR NAME=cmember -->">
+			</td>
+		</TR>
+		<tr>
+			<td>Given Name*</td>
+			<td>Surname*</td>
+			<td>Date of Birth (<!-- TMPL_VAR NAME=dateformat -->)*</td>
+			<td>&nbsp;</td>
+			<td>School</td>
+		</tr>
+		<tr>
+			<td><input type=text name=firstname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
+			<td><input type=text name=surname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
+			<td><input type=text name=dateofbirth_child_<!-- TMPL_VAR NAME=i --> size=10 value=""></td>
+			<td>
+				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>F</b>
+				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>M*</b>
+			</td>
+			<td><input type=text name=school_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
+		</tr>
+		<tr>
+			<td colspan=5>The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
+		<tr>
+			<td>Sorting field 1</td>
+			<td colspan="4">
+				<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>Sorting field 2</td>
+			<td colspan="4">
+				<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>Notes</td>
+		</tr>
+		<tr>
+			<td colspan=5><textarea name=altnotes_child_<!-- TMPL_VAR NAME=i --> wrap=physical cols=70 rows=3></textarea></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+		<tr>
+			<td>
+				<input type=submit class="button members" value="OK">
+			</td>
+			<td><input type=reset class="button members" value="Clear all Fields"></td>
+		</tr>
+	
+		</TABLE>
+	</form>
+</div>
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 9031d642db..7f7979c9b0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -242,7 +242,6 @@
 				<td> Notes</td>
 				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
 			</tr>
-
 			<!-- TMPL_IF NAME="modify" -->
 				<tr><td colspan=5>FLAGS</td></tr>
 				<!-- TMPL_LOOP NAME="flagloop" -->
@@ -255,6 +254,20 @@
 				<!-- /TMPL_LOOP -->
 			<!-- /TMPL_IF -->
 
+			<tr>
+				<td colspan=5>The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
+			<tr>
+				<td>Sorting field 1</td>
+				<td colspan="4">
+					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+				</td>
+			</tr>
+			<tr>
+				<td>Sorting field 2</td>
+				<td colspan="4">
+					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+				</td>
+			</tr>
 
 			<tr>
 				<td></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index a4d13c15e8..ac41b2c64d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -2,8 +2,8 @@
 
 <div id="mainbloc">
 	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
-	<div class="bloc25">
-		<div class="bloctitle">MEMBERSHIP RECORD</div>
+	<div id="bloc25">
+		<h2 class="members">Membership record</h2>
 		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
 		<p>Card number: <!-- TMPL_VAR NAME="cardnumber" --><br>
 		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
@@ -34,6 +34,12 @@
 			Relationship: <!-- TMPL_VAR NAME="altrelationship" --><br>
 		<!-- /TMPL_UNLESS -->
 		Notes: <!-- TMPL_VAR NAME="altnotes" -->
+		<!-- TMPL_IF name="sort1" -->
+			<p>Sort field 1 : <!-- TMPL_VAR name="sort1" --></p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="sort2" -->
+			<p>Sort field 2 : <!-- TMPL_VAR name="sort2" --></p>
+		<!-- /TMPL_IF -->
 		</p>
 		<p>
 		<!-- TMPL_UNLESS name="I" -->
@@ -57,13 +63,12 @@
 		<!-- TMPL_IF name="IS_ADULT" -->
 			
 			<form action="/cgi-bin/koha/members/jmemberentry.pl" method="post">
-				<p align="right"><input type="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
+				<input type="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
 				<input type="hidden" name="type" value="Add">
-				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME=borrowernumber -->"></p>
+				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME=borrowernumber -->">
 			</form>
 			
 		<!-- /TMPL_IF -->
-		<br>
 		<!-- TMPL_IF name="I" -->
 			<form action="/cgi-bin/koha/members/imemberentry.pl" method="post">
 				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
@@ -89,8 +94,8 @@
 		</form>
 	</div>
 
-	<div class="bloc25">
-		<div class="bloctitle">FINES &amp; CHARGES</div>
+	<div id="bloc25">
+		<h2 class="members">Fines &amp; charges</h2>
 		<!-- TMPL_IF name="totaldue" -->
 			Total due <!-- TMPL_VAR name="totaldue"-->
 		<TMPL_ELSE>
@@ -105,8 +110,56 @@
 			</a>
 		</p>
 	</div>
-	<div class="bloc25">
-		<div class="bloctitle">ITEMS CURRENTLY ON ISSUE</div>
+	<div id="bloc25">
+		<h2 class="members">Items requested</h2>
+			<!-- TMPL_IF NAME=reserveloop -->
+			<form action="/cgi-bin/koha/modrequest.pl" method="post">
+			<table>
+				<tr>
+					<th>Title</th>
+					<th>Requested</th>
+					<th>Remove</th>
+				</tr>
+					<!-- TMPL_LOOP NAME=reserveloop -->
+					<tr>
+						<td><input type="hidden" name="from" value="borrower">
+							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+							<!-- TMPL_IF NAME=volumeddesc -->
+								<!-- TMPL_VAR NAME="volumeddesc" -->
+								<!-- TMPL_VAR NAME="itemtype" -->
+							<!-- /TMPL_IF -->
+						</td>
+						<td><!-- TMPL_VAR NAME="reservedate2" --></td>
+						<td>
+							<select name="rank-request">
+							<option value="n">No
+							<option value="del">Yes
+							</select><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+						<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+						</td>
+						
+					</tr>
+					<!-- /TMPL_LOOP -->
+					<tr>
+						<td colspan="5" align="right">
+						<!-- TMPL_IF name="reserveloop" -->
+							<input type="submit" name="submit" value="Update" class="button">
+						<!-- /TMPL_IF -->
+						</td>
+					</tr>
+				</table>
+				</form>
+			<!-- TMPL_ELSE -->
+				None
+			<!-- /TMPL_IF -->
+	</div>
+
+	<div id="bloc25">
+		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
+	</div>
+
+	<div id="bloc25">
+		<h2 class="members">Items currently on issue</h2>
 		<!-- TMPL_IF name="issueloop" -->
 			<form action="renewscript.pl" method="post">
 			<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
@@ -149,53 +202,6 @@
 			None
 		<!-- /TMPL_IF -->
 	</div>
-	<div class="bloc25">
-		<div class="bloctitle">ITEMS REQUESTED</div>
-			<!-- TMPL_IF NAME=reserveloop -->
-			<form action="/cgi-bin/koha/modrequest.pl" method="post">	<table>
-					<tr>
-						<th>Title</th>
-						<th>Requested</th>
-						<th>Remove</th>
-					</tr>
-					
-						
-						<!-- TMPL_LOOP NAME=reserveloop -->
-						<tr>
-							<td><input type="hidden" name="from" value="borrower">
-								<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
-								<!-- TMPL_IF NAME=volumeddesc -->
-									<!-- TMPL_VAR NAME="volumeddesc" -->
-									<!-- TMPL_VAR NAME="itemtype" -->
-								<!-- /TMPL_IF -->
-							</td>
-							<td><!-- TMPL_VAR NAME="reservedate2" --></td>
-							<td>
-								<select name="rank-request">
-								<option value="n">No
-								<option value="del">Yes
-								</select><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
-							<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
-							</td>
-							
-						</tr>
-						<!-- /TMPL_LOOP -->
-						<tr>
-							<td colspan="5" align="right">
-							<!-- TMPL_IF name="reserveloop" -->
-								<input type="submit" name="submit" value="Update" class="button">
-							<!-- /TMPL_IF -->
-							</td>
-						</tr>
-					
-				</table></form>
-			<!-- TMPL_ELSE -->
-				None
-			<!-- /TMPL_IF -->
-	</div>
-
-<p>		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a></p>
-
 </div>
 <script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
index 3496d2a05f..8d314769e1 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
@@ -1,85 +1,85 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
-
-<!-- TMPL_IF Name="NOK" -->
-	<!-- TMPL_VAR Name="string" -->
-<!-- TMPL_ELSE -->
-	<H1> Confirm Record </H1>
-	<!-- TMPL_LOOP Name="identsloop" -->
-		<!-- TMPL_IF Name="cardchild" -->
-			<table border=0 cellspacing=0 cellpadding=5>
-				<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-					<td background="<!-- TMPL_VAR Name="image" -->">
-					<B> NEW MEMBER </B>
-					</td>
-					<td>
-					&nbsp;
-					</td>
-				</tr>
-				<tr valign=top bgcolor="white" >
-					<td>
-					<B>Name</B>
-					</td>
-					<td>
-					<!-- TMPL_VAR Name="name" -->
-					</td>
-				</tr>
-				<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-					<td background="<!-- TMPL_VAR Name="image" -->">
-					<B> MEMBERSHIP DETAILS </B>
-					</td>
-					<td>
-					&nbsp;
-					</td>
-				</tr>
-				<tr valign=top bgcolor="white" >
-					<td>
-					<B>Membership Number</B>
-					</td>
-					<td>
-					<!-- TMPL_VAR Name="bornum" -->
-					</td>
-				</tr>
-				<tr valign=top bgcolor="white" >
-					<td>
-					<B>Date of birth</B>
-					</td>
-					<td>
-					<!-- TMPL_VAR Name="dob" -->
-					</td>
-				</tr>
-				<tr valign=top bgcolor="white" >
-					<td>
-					<B>Sex</B>
-					</td>
-					<td>
-					<!-- TMPL_VAR Name="sex" -->
-					</td>
-				</tr>
-				<tr valign=top bgcolor="white" >
-					<td>
-					<B>School</B>
-					</td>
-					<td>
-					<!-- TMPL_VAR Name="school" -->
-					</td>
-				</tr>
-				<tr valign=top bgcolor="white" >
-					<td>
-					<B>General Notes</B>
-					</td>
-					<td>
-					<!-- TMPL_VAR Name="notes" -->
-					</td>
-				</tr>
-			</TABLE><p>
-		<!-- /TMPL_IF -->
-  <!-- /TMPL_LOOP -->
-	<form action="/cgi-bin/koha/members/insertjdata.pl" method=post>
-		<!-- TMPL_LOOP NAME=inputsloop -->
-			<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
-		<!-- /TMPL_LOOP -->
-		<input type=submit name=submit value=submit>
-	</form>
-<!-- /TMPL_IF -->
-
+<div id="mainbloc">
+	<!-- TMPL_IF Name="NOK" -->
+		<!-- TMPL_VAR Name="string" -->
+	<!-- TMPL_ELSE -->
+		<H1> Confirm Record </H1>
+		<!-- TMPL_LOOP Name="identsloop" -->
+			<!-- TMPL_IF Name="cardchild" -->
+				<table border=0 cellspacing=0 cellpadding=5>
+					<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+						<td background="<!-- TMPL_VAR Name="image" -->">
+						<B> NEW MEMBER </B>
+						</td>
+						<td>
+						&nbsp;
+						</td>
+					</tr>
+					<tr valign=top bgcolor="white" >
+						<td>
+						<B>Name</B>
+						</td>
+						<td>
+						<!-- TMPL_VAR Name="name" -->
+						</td>
+					</tr>
+					<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+						<td background="<!-- TMPL_VAR Name="image" -->">
+						<B> MEMBERSHIP DETAILS </B>
+						</td>
+						<td>
+						&nbsp;
+						</td>
+					</tr>
+					<tr valign=top bgcolor="white" >
+						<td>
+						<B>Membership Number</B>
+						</td>
+						<td>
+						<!-- TMPL_VAR Name="bornum" -->
+						</td>
+					</tr>
+					<tr valign=top bgcolor="white" >
+						<td>
+						<B>Date of birth</B>
+						</td>
+						<td>
+						<!-- TMPL_VAR Name="dob" -->
+						</td>
+					</tr>
+					<tr valign=top bgcolor="white" >
+						<td>
+						<B>Sex</B>
+						</td>
+						<td>
+						<!-- TMPL_VAR Name="sex" -->
+						</td>
+					</tr>
+					<tr valign=top bgcolor="white" >
+						<td>
+						<B>School</B>
+						</td>
+						<td>
+						<!-- TMPL_VAR Name="school" -->
+						</td>
+					</tr>
+					<tr valign=top bgcolor="white" >
+						<td>
+						<B>General Notes</B>
+						</td>
+						<td>
+						<!-- TMPL_VAR Name="notes" -->
+						</td>
+					</tr>
+				</TABLE><p>
+			<!-- /TMPL_IF -->
+	<!-- /TMPL_LOOP -->
+		<form action="/cgi-bin/koha/members/insertjdata.pl" method=post>
+			<!-- TMPL_LOOP NAME=inputsloop -->
+				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+			<!-- /TMPL_LOOP -->
+			<input type=submit name=submit value="submit" class="button members">
+		</form>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
diff --git a/members/insertjdata.pl b/members/insertjdata.pl
index 7154ee6a1a..44f72ad954 100755
--- a/members/insertjdata.pl
+++ b/members/insertjdata.pl
@@ -56,7 +56,7 @@ for (my $i=0;$i<1;$i++){
 		altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
 		categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
 		borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
-		initials='$data{'initials'}',streetaddress='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',physstreet='$data{'physstreet'}'
+		initials='$data{'initials'}',streetaddress='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',physstreet='$data{'physstreet'}',sort1='$data{sort1}',sort2='$data{'sort2'}'
 		where borrowernumber=$data{'borrowernumber'}";
 		#  print $query;
 	}elsif ($data{"cardnumber_child_$i"} ne ''){
@@ -79,7 +79,7 @@ for (my $i=0;$i<1;$i++){
 		$query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
 		firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
 		altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-		initials,ethnicity,borrowernumber,guarantor,school,physstreet)
+		initials,ethnicity,borrowernumber,guarantor,school,physstreet,sort1,sort2)
 		values ('','$data{'expiry'}',
 		'$cardnumber',
 		'$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
@@ -87,7 +87,7 @@ for (my $i=0;$i<1;$i++){
 		'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
 		'$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
 		'$notes','$data{'altphone'}','$surname','$data{'initials'}',
-		'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}')";
+		'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}','$data{'sort1'}','$data{'sort2'}')";
 
 	}
 	#print $query;
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 474853d04f..678bbcd919 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -131,7 +131,7 @@ if ($op eq 'add' or $op eq 'modify') {
 			initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
 			gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
 			textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}',
-			zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}'
+			zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}', sort1='$data{'sort1'}', sort2='$data{'sort2'}'
 			where borrowernumber=$data{'borrowernumber'}";
 		}else{
 			$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
@@ -141,13 +141,13 @@ if ($op eq 'add' or $op eq 'modify') {
 			$query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
 			firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
 			altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-			initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
+			initials,ethnicity,physstreet,branchcode,zipcode,homezipcode,sort1,sort2) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
 			'$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
 			'$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
 			'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
 			'$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
 			'$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
-			'$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')";
+			'$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}','$data{'sort1'}','$data{'sort2'}')";
 		}
 		# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
 		# so when we update information for an adult we should check for guarantees and update the relevant part
@@ -308,6 +308,8 @@ if ($delete){
 				expiry		=> $data->{'expiry'},
 				cardnumber	=> $cardnumber,
 				dateofbirth	=> $data->{'dateofbirth'},
+				sort1 => $data->{'sort1'},
+				sort2 => $data->{'sort2'},
 				dateformat      => display_date_format(),
 			        modify          => $modify,
 				CGIbranch => $CGIbranch);
diff --git a/updater/updatedatabase b/updater/updatedatabase
index b3dcd0eca0..26d9aed7ba 100755
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -324,12 +324,14 @@ my %requirefields = (
         'nocalc'      => 'int(11)'
     },
     borrowers => {
-        'userid'        => 'char(30)',
-        'password'      => 'char(30)',
-        'flags'         => 'int(11)',
-        'textmessaging' => 'varchar(30)',
-	   'zipcode' => 'varchar(25)',
-			'homezipcode' => 'varchar(25)',
+		'userid'        => 'char(30)',
+		'password'      => 'char(30)',
+		'flags'         => 'int(11)',
+		'textmessaging' => 'varchar(30)',
+		'zipcode' => 'varchar(25)',
+		'homezipcode' => 'varchar(25)',
+		'sort1' => 'char(80)',
+		'sort2' => 'char(80)',
     },
     aqorders => { 'budgetdate' => 'date',
 				'sort1' => 'char(80)',
@@ -1247,6 +1249,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.90  2004/07/06 08:24:18  tipaul
+# adding 2 free fields that can be used for sorting purposes
+#
 # Revision 1.89  2004/07/02 15:55:08  tipaul
 # Adding 2 new fields, called "sort1" and "sort2"
 # They can be used for sorting & statistics reasons by the library.
-- 
2.39.5