From d27c5bb42742926fab6817bf02679c9b9b02f94a Mon Sep 17 00:00:00 2001
From: rangi <rangi>
Date: Mon, 2 Jul 2007 02:30:15 +0000
Subject: [PATCH] Fix for bug 1296, making surnames uppercase a systems
 preference

---
 admin/systempreferences.pl                            |  3 ++-
 .../intranet-tmpl/prog/en/members/memberentryA.tmpl   |  4 ++++
 .../intranet-tmpl/prog/en/members/memberentryC.tmpl   |  4 ++++
 .../intranet-tmpl/prog/en/members/memberentryP.tmpl   |  6 +++++-
 .../intranet-tmpl/prog/fr/members/memberentryA.tmpl   |  9 ++++++++-
 members/memberentry.pl                                |  2 ++
 updater/updatedatabase                                | 11 +++++++++++
 7 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index acac5c9c04..b651a17f58 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -127,7 +127,8 @@ my %tabsysprefs;
     $tabsysprefs{BorrowersTitles}="Members";    
     $tabsysprefs{patronimages}="Members";
     $tabsysprefs{MinPasswordLength}="Members";
-    
+    $tabsysprefs{uppercasesurnames}="Members";
+
 # OPAC
     $tabsysprefs{AmazonAssocTag}="OPAC";
     $tabsysprefs{AmazonContent}="OPAC";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
index 8055abc8ec..e5300c7594 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@@ -138,7 +138,11 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Surname</label>
+		<! --TMPL_IF NAME="uppercasesurnames" -->
 		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<!-- TMPL_ELSE -->
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<!-- /TMPL_IF -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatoryfirstname" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index 5abd9a7249..43cc3fca87 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -137,7 +137,11 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Surname</label>
+		<! --TMPL_IF NAME="uppercasesurnames" -->                                
 		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        <!-- TMPL_ELSE -->                       
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+        <!-- /TMPL_IF --> 
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatoryfirstname" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
index dc44cef870..728f71321c 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@@ -132,7 +132,11 @@
         <label>
         <!-- /TMPL_IF-->
         Surname</label>
-        <input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<! --TMPL_IF NAME="uppercasesurnames" -->                                
+		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        <!-- TMPL_ELSE -->                       
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+        <!-- /TMPL_IF --> 
         </p>
         <p>
         <!-- TMPL_IF NAME="mandatoryfirstname" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl
index 29043d944f..6848b99fba 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl
@@ -132,7 +132,14 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Nom de famille</label>
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<! --TMPL_IF NAME="uppercasesurnames" -->                                
+        <input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        <!-- TMPL_ELSE -->                       
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+        <!-- /TMPL_IF --> 
+
+
+
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatoryfirstname" -->
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 8788e41ed5..aad5a04ceb 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -83,6 +83,8 @@ my $check_categorytype=$input->param('check_categorytype');
 # NOTE: Alert for ethnicity and ethnotes fields, they are unvalided in all borrowers form
 my $borrower_data;
 
+$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
+
 #function  to automatic setup the mandatory  fields (visual with css)
 my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
 my @field_check=split(/\|/,$check_BorrowerMandatoryField);
diff --git a/updater/updatedatabase b/updater/updatedatabase
index 18fd16f057..441fba8dd0 100755
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -519,6 +519,14 @@ my %tabledata = (
             explanation         => "Enter a specific hash for NoZebra indexes. Enter : 'indexname' => '100a,245a,500*','index2' => '...'",
             type                => 'Free',
         },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'uppercasesurnames',
+            value               => '0',
+            forceupdate         => {'explanation' => 1, 'type' => 1},
+            explanation         => "Force Surnames to be uppercase",
+            type                => 'YesNo',
+        },
     ],
     userflags => [
         {
@@ -2048,6 +2056,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.171  2007/07/02 02:30:16  rangi
+# Fix for bug 1296, making surnames uppercase a systems preference
+#
 # Revision 1.170  2007/06/26 13:25:37  tipaul
 # removing some useless tables from updatedatabase
 #