[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/mo... [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        07/01/11 15:44:54

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl 
        members        : moremember.pl 

Log message:
        Fix a bug if moremember.pl is called with a borrowernumber which not 
exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.20&r2=1.12.2.21
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.17&r2=1.28.2.18

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.20
retrieving revision 1.12.2.21
diff -u -b -r1.12.2.20 -r1.12.2.21
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     19 Dec 2006 
17:06:20 -0000      1.12.2.20
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     11 Jan 2007 
15:44:54 -0000      1.12.2.21
@@ -3,6 +3,17 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+
+<!-- TMPL_IF NAME="unknowuser" -->
+    <p>
+        <b>
+            This member doesn't exist anymore.
+        </b>
+        <br /><br />
+        <a href="javascript:back();">Go Back</a>
+    </p>
+<!-- TMPL_ELSE -->
+
 <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- 
TMPL_VAR NAME="cardnumber" -->)</h1>
        <form name="form">
        <input type="hidden" name="reregistration" value="<!-- TMPL_VAR 
NAME="reregistration"-->"> 
@@ -57,7 +68,7 @@
     Renew
     </a>
 </div>
-
+<br />
 <!-- TMPL_IF NAME="flagged" -->
     <ul>
         <!-- TMPL_IF NAME="debarred" -->
@@ -318,4 +329,5 @@
     }
 }
 </script>
+<!-- /TMPL_IF --> <!-- unknowuser -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.17
retrieving revision 1.28.2.18
diff -u -b -r1.28.2.17 -r1.28.2.18
--- members/moremember.pl       15 Dec 2006 17:38:43 -0000      1.28.2.17
+++ members/moremember.pl       11 Jan 2007 15:44:54 -0000      1.28.2.18
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: moremember.pl,v 1.28.2.17 2006/12/15 17:38:43 btoumi Exp $
+# $Id: moremember.pl,v 1.28.2.18 2007/01/11 15:44:54 toins Exp $
 
 =head1 moremember.pl
 
@@ -81,6 +81,14 @@
 my $data           = borrdata( '', $borrowernumber );
 my $reregistration = $input->param('reregistration');
 
+if ( not defined $data ) {
+    $template->param (
+        unknowuser => 1
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
+    exit;
+}
+
 # re-reregistration function to automatic calcul of date expiry
 (
     $data->{'dateexpiry'} = GetMembeReregistration(