[Koha-cvs] koha C4/Members.pm members/member-picupload.pl ... [rel_TG]
Tumer Garip
tgarip at neu.edu.tr
Tue Mar 27 14:36:39 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_TG
Changes by: Tumer Garip <tgarip1957> 07/03/27 12:36:38
Modified files:
C4 : Members.pm
members : member-picupload.pl memberentry.pl
moremember.pl
Log message:
Removing some NEU specific stuff
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_TG&r1=1.39.2.2&r2=1.39.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-picupload.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.39.2.2&r2=1.39.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.29.2.2&r2=1.29.2.3
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -b -r1.39.2.2 -r1.39.2.3
--- C4/Members.pm 25 Mar 2007 23:46:14 -0000 1.39.2.2
+++ C4/Members.pm 27 Mar 2007 12:36:38 -0000 1.39.2.3
@@ -19,7 +19,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.39.2.2 2007/03/25 23:46:14 tgarip1957 Exp $
+# $Id: Members.pm,v 1.39.2.3 2007/03/27 12:36:38 tgarip1957 Exp $
use strict;
require Exporter;
@@ -34,7 +34,7 @@
use Date::Calc qw(:all);
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.39.2.2 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.39.2.3 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -968,7 +968,8 @@
#my $sth=$dbh->prepare("select max(borrowers.cardnumber) from borrowers");
$sth->execute;
-
+ $cardnumber=$sth->fetchrow;
+ $cardnumber+=1;
$cardnumber="V$cardnumber$rem";
}
return $cardnumber;
@@ -1185,20 +1186,19 @@
}
}
-# Search the member photo, in case that photo doesn´t exists, return a default photo.for NEU
+# Search the member photo, in case that photo doesn´t exists, return a default no photo
sub getMemberPhoto {
my $cardnumber = shift @_;
my $htdocs = C4::Context->config('opacdir');
-my $dirname = $htdocs."/htdocs/uploaded-files/users-photo/";
-# my $dirname = "$ENV{'DOCUMENT_ROOT'}/uploaded-files/users-photo";
- opendir(DIR, $dirname) or die "Can't open directory $dirname: $!";
+my $dirname= "$ENV{'DOCUMENT_ROOT'}/uploaded-files/users-photo";
+ opendir(DIR, $dirname) ;
while (defined(my $file = readdir(DIR))) {
if ($file =~ /^$cardnumber\..+/){
return "/uploaded-files/users-photo/$file";
}
}
closedir(DIR);
- return "http://cc.neu.edu.tr/stdpictures/".$cardnumber.".jpg";
+ return "/uploaded-files/users-photo/nophoto.jpg";
}
sub change_user_pass {
Index: members/member-picupload.pl
===================================================================
RCS file: /sources/koha/koha/members/member-picupload.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- members/member-picupload.pl 26 Mar 2007 00:07:52 -0000 1.1.4.2
+++ members/member-picupload.pl 27 Mar 2007 12:36:38 -0000 1.1.4.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
- # $Id: member-picupload.pl,v 1.1.4.2 2007/03/26 00:07:52 tgarip1957 Exp $
+ # $Id: member-picupload.pl,v 1.1.4.3 2007/03/27 12:36:38 tgarip1957 Exp $
# script to upload a picture to a borrowerimages directory.
# checks to see if its either displaying the upload form
@@ -41,8 +41,8 @@
my $template_name;
- my $htdocs = C4::Context->config('opacdir');
- my $upload_dir = $htdocs."/htdocs/uploaded-files/users-photo";
+ my $htdocs = C4::Context->config('opachtdocs');
+ my $upload_dir = $htdocs."/uploaded-files/users-photo";
if($photo eq ""){
$template_name = "members/member-picupload.tmpl";
} else {
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -b -r1.39.2.2 -r1.39.2.3
--- members/memberentry.pl 26 Mar 2007 00:07:52 -0000 1.39.2.2
+++ members/memberentry.pl 27 Mar 2007 12:36:38 -0000 1.39.2.3
@@ -2,7 +2,7 @@
# NOTE: This file uses standard 8-space tabs
# DO NOT SET TAB SIZE TO 4
-# $Id: memberentry.pl,v 1.39.2.2 2007/03/26 00:07:52 tgarip1957 Exp $
+# $Id: memberentry.pl,v 1.39.2.3 2007/03/27 12:36:38 tgarip1957 Exp $
#script to set up screen for modification of borrower details
#written 20/12/99 by chris at katipo.co.nz
@@ -73,8 +73,10 @@
$data{$key}=~ s/\"/\\\"/g;
}
-if ($op eq 'add'){ $cardnumber=C4::Members::fixupneu_cardnumber($data{'cardnumber'},$data{'categorycode'});
- $data{'cardnumber'}=$cardnumber;}
+if ($op eq 'add'){
+ $cardnumber=C4::Members::fixup_cardnumber($data{'cardnumber'},$data{'categorycode'});
+ $data{'cardnumber'}=$cardnumber;
+}
my @errors;
if ($data{'cardnumber'} eq '' && ! $autonumber_members){
push @errors,"ERROR_cardnumber";
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -b -r1.29.2.2 -r1.29.2.3
--- members/moremember.pl 26 Mar 2007 00:07:52 -0000 1.29.2.2
+++ members/moremember.pl 27 Mar 2007 12:36:38 -0000 1.29.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.29.2.2 2007/03/26 00:07:52 tgarip1957 Exp $
+# $Id: moremember.pl,v 1.29.2.3 2007/03/27 12:36:38 tgarip1957 Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -73,17 +73,17 @@
$template->param($data->{'categorycode'} => 1); # in template <TMPL_IF name="I"> => instutitional (A for Adult & C for children)
my $picture;
- my $htdocs = C4::Context->config('opacdir');
-
-$picture =$htdocs. "/htdocs/uploaded-files/users-photo/".$data->{'cardnumber'}.".jpg";
+ my $htdocs = C4::Context->config('opachtdocs');
+$picture =$htdocs. "/uploaded-files/users-photo/".$data->{'cardnumber'}.".jpg";
+####NEU Specific web address, either write your own or make a system variable and read it from there
if (-e $picture)
{
-
$template->param(borrowerphoto => "http://library.neu.edu.tr/uploaded-files/users-photo/".$data->{'cardnumber'}.".jpg");
}else{
-$picture = "http://cc.neu.edu.tr/stdpictures/".$data->{'cardnumber'}.".jpg";
+$picture = "http://library.neu.edu.tr/uploaded-files/users-photo/nophoto.jpg";
$template->param(borrowerphoto => $picture);
}
+###END NEU SPecific
$data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
$data->{'expiry'} = format_date($data->{'expiry'});
$data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
More information about the Koha-cvs
mailing list