Attachment #41281 for bug #6874

View | Details | Raw Unified | Return to bug 6874
Collapse All | Expand All




    return;
}

=head2 DanglingEntry

    C4::UploadedFiles::DanglingEntry($id,$isfileuploadurl);

Determine if a entry is dangling.

Returns: 2 == no db entry
         1 == no file
         0 == both a file and db entry.
        -1 == N/A (undef id / non-file-upload URL)

=cut

sub DanglingEntry {
    my ($id,$isfileuploadurl) = @_;
    my $retval;

    if (defined($id)) {
        my $file = GetUploadedFile($id);
        if($file) {
            my $file_path = $file->{filepath};
            my $file_deleted = 0;
            unless( -f $file_path ) {
                $retval = 1;
            } else {
                $retval = 0;
            }
        }
        else {
            if ( $isfileuploadurl ) {
                $retval = 2;
            }
            else {
                $retval = -1;
            }
        }
    }
    else {
        $retval = -1;
    }
    return $retval;
}

=head2 DelUploadedFile

    C4::UploadedFiles::DelUploadedFile($id);

Remove a previously uploaded file, given its id.

Returns: 1 == file deleted
         0 == file not deleted
         -1== no file to delete / no meaninful id passed

=cut

sub DelUploadedFile {
    my ($id) = @_;
    my $retval;

    if ($id) {
        my $file = GetUploadedFile($id);
        if($file) {
            my $file_path = $file->{filepath};
            my $file_deleted = 0;
            unless( -f $file_path ) {
                warn "Id $file->{id} is in database but not in filesystem, removing id from database";
            if(unlink $file_path) {
                $file_deleted = 1;
            } else {
                if(unlink $file_path) {
                    $file_deleted = 1;
                }
            }
        }

            unless($file_deleted) {
                warn "File $file_path cannot be deleted: $!";
            }

            my $dbh = C4::Context->dbh;
            my $query = qq{
                DELETE FROM uploaded_files
                WHERE id = ?
            };
            my $sth = $dbh->prepare($query);
            my $numrows = $sth->execute($id);
            # if either a DB entry or file was deleted,
            # then clearly we have a deletion.
            if ($numrows>0 || $file_deleted==1) {
                $retval = 1;
            }
            else {
                $retval = 0;
            }
        }
        else {
            warn "There was no file for id=($id)";
            $retval = -1;
        }
    }
    else {
        warn "DelUploadFile called with no id.";
        $retval = -1;
    }
    return $retval;
}

1;

Lines 46-55 sub plugin_javascript { Link Here

(-)a/cataloguing/value_builder/upload.pl (-10 / +32 lines)
46		46
47	function Clic$function_name(index) {	47	function Clic$function_name(index) {
48	var id = document.getElementById(index).value;	48	var id = document.getElementById(index).value;
		49	var IsFileUploadUrl=0;
		50	if (id.match(/opac-retrieve-file/)) {
		51	IsFileUploadUrl=1;
		52	}
49	if(id.match(/id=([0-9a-f]+)/)){	53	if(id.match(/id=([0-9a-f]+)/)){
50	id = RegExp.\$1;	54	id = RegExp.\$1;
51	}	55	}
52	window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=upload.pl&index=\"+index+\"&id=\"+id, 'upload', 'width=600,height=400,toolbar=false,scrollbars=no');	56	var newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=upload.pl&index=\"+index+\"&id=\"+id+\"&from_popup=0\"+\"&IsFileUploadUrl=\"+IsFileUploadUrl, 'upload', 'width=600,height=400,toolbar=false,scrollbars=no');
		57	newin.focus();
53		58
54	}	59	}
55	</script>	60	</script>
Lines 64-73 sub plugin { Link Here
64	my $id = $input->param('id');	69	my $id = $input->param('id');
65	my $delete = $input->param('delete');	70	my $delete = $input->param('delete');
66	my $uploaded_file = $input->param('uploaded_file');	71	my $uploaded_file = $input->param('uploaded_file');
67		72	my $from_popup = $input->param('from_popup');
68	my $template_name = ($id \|\| $delete)	73	my $isfileuploadurl = $input->param('IsFileUploadUrl');
69	? "upload_delete_file.tt"	74	my $dangling = C4::UploadedFiles::DanglingEntry($id,$isfileuploadurl);
70	: "upload.tt";	75	my $template_name;
		76	if ($delete \|\| ($id && ($dangling==0 \|\| $dangling==1))) {
		77	$template_name = "upload_delete_file.tt";
		78	}
		79	else {
		80	$template_name = "upload.tt";
		81	}
71		82
72	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	83	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
73	{ template_name => "cataloguing/value_builder/$template_name",	84	{ template_name => "cataloguing/value_builder/$template_name",
Lines 79-84 sub plugin { Link Here
79	}	90	}
80	);	91	);
81		92
		93	if ($dangling==2) {
		94	$template->param( dangling => 1 );
		95	}
		96
82	# Dealing with the uploaded file	97	# Dealing with the uploaded file
83	my $dir = $input->param('dir');	98	my $dir = $input->param('dir');
84	if ($uploaded_file and $dir) {	99	if ($uploaded_file and $dir) {
Lines 97-110 sub plugin { Link Here
97	} else {	112	} else {
98	$template->param(error => 1);	113	$template->param(error => 1);
99	}	114	}
100	} elsif ($delete \|\| $id) {	115	} elsif ($delete \|\| ($id && ($dangling==0 \|\| $dangling==1))) {
101	# If there's already a file uploaded for this field,	116	# If there's already a file uploaded for this field,
102	# We handle its deletion	117	# We handle its deletion
103	if ($delete) {	118	if ($delete) {
104	if(C4::UploadedFiles::DelUploadedFile($id)) {;	119	if(C4::UploadedFiles::DelUploadedFile($id)==0) {;
105	$template->param(success => 1);
106	} else {
107	$template->param(error => 1);	120	$template->param(error => 1);
		121	} else {
		122	$template->param(success => 1);
108	}	123	}
109	}	124	}
110	} else {	125	} else {
Lines 129-142 sub plugin { Link Here
129	$template->param( error_upload_path_not_configured => 1 );	144	$template->param( error_upload_path_not_configured => 1 );
130	}	145	}
131		146
		147	if (!$uploaded_file && !$dir && $from_popup) {
		148	$template->param(error_nothing_selected => 1);
		149	}
		150	elsif (!$uploaded_file && $dir) {
		151	$template->param(error_no_file_selected => 1);
		152	}
132	if ($uploaded_file and not $dir) {	153	if ($uploaded_file and not $dir) {
133	$template->param(error_no_dir_selected => 1);	154	$template->param(error_no_dir_selected => 1);
134	}	155	}
		156
135	}	157	}
136		158
137	$template->param(	159	$template->param(
138	index => $index,	160	index => $index,
139	id => $id	161	id => $id,
140	);	162	);
141		163
142	output_html_with_http_headers $input, $cookie, $template->output;	164	output_html_with_http_headers $input, $cookie, $template->output;

Lines 3364-3370 CREATE TABLE IF NOT EXISTS `borrower_modifications` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
3364	-- Table structure for table uploaded_files	3364	-- Table structure for table uploaded_files
3365	--	3365	--
3366		3366
3367	DROP TABLE IF EXISTS uploaded_files	3367	DROP TABLE IF EXISTS uploaded_files;
3368	CREATE TABLE uploaded_files (	3368	CREATE TABLE uploaded_files (
3369	id CHAR(40) NOT NULL PRIMARY KEY,	3369	id CHAR(40) NOT NULL PRIMARY KEY,
3370	filename TEXT NOT NULL,	3370	filename TEXT NOT NULL,




    <script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
    <script type="text/javascript">
      function ValidateForm() {
        var filename = document.forms["UploadForm"]["uploaded_file"].value;
        var selected = 0;
        var value;
        $('form').each(function() {
          value = $(this).find('input[type="radio"][name="dir"]:checked').val();
          if (value) {
            selected = 1;
          }
        });
        if (!filename && !selected) {
          alert("Please select a file and its destination.");
          return false;
        }
        else if (!filename) {
          alert("Please select a file to upload.");
          return false;
        }
        else if (!selected) {
          alert("Please select a file destination.");
          return false;
        }
        else {
          return true;
        }
      }
    </script>

</head>

          <p>Configuration variable 'upload_path' is not configured.</p>
          <p>Please configure it in your koha-conf.xml</p>
        [% ELSE %]
          [% IF (error_nothing_selected) %]
              <p class="error">Error: You have to choose the file to upload and select where to upload the file.</p>
          [% END %]
          [% IF (error_no_file_selected) %]
              <p class="error">Error: You have to choose the file to upload.</p>
          [% END %]
          [% IF (error_no_dir_selected) %]
              <p class="error">Error: You have to select where to upload the file.</p>
          [% END %]
          [% IF (dangling) %]
              <p class="error">Error: The URL has no file to retrieve.</p>
          [% END %]
          <h2>Please select the file to upload : </h2>
          <form name="UploadForm" method="post" enctype="multipart/form-data" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl" onsubmit="return ValidateForm()">
              [% filefield %]
              <h3>Choose where to upload the file</h3>
              [% INCLUDE list_dirs dirs = dirs_tree %]
              <input type="hidden" name="from_popup" value="1" />
              <input type="hidden" name="plugin_name" value="upload.pl" />
              <input type="hidden" name="index" value="[% index %]" />
              <input type="submit" value="Upload file">
              <input type="button" value="Cancel" onclick="window.close();" />
          </form>
        [% END %]
    [% END %]

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt (-1 / +1 lines)
4	<head>	4	<head>
5	<title>Upload plugin</title>	5	<title>Upload plugin</title>
6	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	6	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7	<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>	7	<script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
8	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />	8	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
9	<script type="text/javascript">	9	<script type="text/javascript">
10	//<![CDATA[	10	//<![CDATA[




use Modern::Perl;
use File::Temp qw/ tempdir /;
use Test::CGI::Multipart;
use Test::More tests => 15;

use t::lib::Mocks;



ok(-e $file->{filepath}, "File $file->{filepath} exists");

ok(C4::UploadedFiles::DanglingEntry()==-1, "DanglingEntry() returned -1 as expected.");
ok(C4::UploadedFiles::DanglingEntry($id)==0, "DanglingEntry($id) returned 0 as expected.");
unlink ($file->{filepath});
ok(C4::UploadedFiles::DanglingEntry($id)==1, "DanglingEntry($id) returned 1 as expected.");

open my $fh,">",($file->{filepath});
print $fh "";
close $fh;

ok(C4::UploadedFiles::DelUploadedFile($id)==1, "DelUploadedFile($id) returned 1.");
ok(C4::UploadedFiles::DelUploadedFile($id)==-1, "DelUploadedFile($id) returned -1 as expected.");
ok(! -e $file->{filepath}, "File $file->{filepath} does not exist anymore");

is(C4::UploadedFiles::UploadFile($testfilename, '../', $testfile_fh->handle), undef, 'UploadFile with $dir containing ".." return undef');
- 

Return to bug 6874

Lines 183-226 sub UploadFile { Link Here

(-)a/C4/UploadedFiles.pm (-22 / +87 lines)
183	return;	183	return;
184	}	184	}
185		185
		186	=head2 DanglingEntry
		187
		188	C4::UploadedFiles::DanglingEntry($id,$isfileuploadurl);
		189
		190	Determine if a entry is dangling.
		191
		192	Returns: 2 == no db entry
		193	1 == no file
		194	0 == both a file and db entry.
		195	-1 == N/A (undef id / non-file-upload URL)
		196
		197	=cut
		198
		199	sub DanglingEntry {
		200	my ($id,$isfileuploadurl) = @_;
		201	my $retval;
		202
		203	if (defined($id)) {
		204	my $file = GetUploadedFile($id);
		205	if($file) {
		206	my $file_path = $file->{filepath};
		207	my $file_deleted = 0;
		208	unless( -f $file_path ) {
		209	$retval = 1;
		210	} else {
		211	$retval = 0;
		212	}
		213	}
		214	else {
		215	if ( $isfileuploadurl ) {
		216	$retval = 2;
		217	}
		218	else {
		219	$retval = -1;
		220	}
		221	}
		222	}
		223	else {
		224	$retval = -1;
		225	}
		226	return $retval;
		227	}
		228
186	=head2 DelUploadedFile	229	=head2 DelUploadedFile
187		230
188	C4::UploadedFiles::DelUploadedFile($id);	231	C4::UploadedFiles::DelUploadedFile($id);
189		232
190	Remove a previously uploaded file, given its id.	233	Remove a previously uploaded file, given its id.
191		234
192	Returns a false value if an error occurs.	235	Returns: 1 == file deleted
		236	0 == file not deleted
		237	-1== no file to delete / no meaninful id passed
193		238
194	=cut	239	=cut
195		240
196	sub DelUploadedFile {	241	sub DelUploadedFile {
197	my ($id) = @_;	242	my ($id) = @_;
198		243	my $retval;
199	my $file = GetUploadedFile($id);	244
200	if($file) {	245	if ($id) {
201	my $file_path = $file->{filepath};	246	my $file = GetUploadedFile($id);
202	my $file_deleted = 0;	247	if($file) {
203	unless( -f $file_path ) {	248	my $file_path = $file->{filepath};
204	warn "Id $file->{id} is in database but not in filesystem, removing id from database";	249	my $file_deleted = 0;
205	$file_deleted = 1;	250	unless( -f $file_path ) {
206	} else {	251	warn "Id $file->{id} is in database but not in filesystem, removing id from database";
207	if(unlink $file_path) {
208	$file_deleted = 1;	252	$file_deleted = 1;
		253	} else {
		254	if(unlink $file_path) {
		255	$file_deleted = 1;
		256	}
209	}	257	}
210	}
211		258
212	unless($file_deleted) {	259	unless($file_deleted) {
213	warn "File $file_path cannot be deleted: $!";	260	warn "File $file_path cannot be deleted: $!";
214	}	261	}
215		262
216	my $dbh = C4::Context->dbh;	263	my $dbh = C4::Context->dbh;
217	my $query = qq{	264	my $query = qq{
218	DELETE FROM uploaded_files	265	DELETE FROM uploaded_files
219	WHERE id = ?	266	WHERE id = ?
220	};	267	};
221	my $sth = $dbh->prepare($query);	268	my $sth = $dbh->prepare($query);
222	return $sth->execute($id);	269	my $numrows = $sth->execute($id);
		270	# if either a DB entry or file was deleted,
		271	# then clearly we have a deletion.
		272	if ($numrows>0 \|\| $file_deleted==1) {
		273	$retval = 1;
		274	}
		275	else {
		276	$retval = 0;
		277	}
		278	}
		279	else {
		280	warn "There was no file for id=($id)";
		281	$retval = -1;
		282	}
		283	}
		284	else {
		285	warn "DelUploadFile called with no id.";
		286	$retval = -1;
223	}	287	}
		288	return $retval;
224	}	289	}
225		290
226	1;	291	1;

Lines 3-9 Link Here

(-)a/t/db_dependent/UploadedFiles.t (-3 / +12 lines)
3	use Modern::Perl;	3	use Modern::Perl;
4	use File::Temp qw/ tempdir /;	4	use File::Temp qw/ tempdir /;
5	use Test::CGI::Multipart;	5	use Test::CGI::Multipart;
6	use Test::More tests => 11;	6	use Test::More tests => 15;
7		7
8	use t::lib::Mocks;	8	use t::lib::Mocks;
9		9
Lines 35-41 foreach my $key (qw(id filename filepath dir)) { Link Here
35		35
36	ok(-e $file->{filepath}, "File $file->{filepath} exists");	36	ok(-e $file->{filepath}, "File $file->{filepath} exists");
37		37
38	ok(C4::UploadedFiles::DelUploadedFile($id), "DelUploadedFile($id) returned true");	38	ok(C4::UploadedFiles::DanglingEntry()==-1, "DanglingEntry() returned -1 as expected.");
		39	ok(C4::UploadedFiles::DanglingEntry($id)==0, "DanglingEntry($id) returned 0 as expected.");
		40	unlink ($file->{filepath});
		41	ok(C4::UploadedFiles::DanglingEntry($id)==1, "DanglingEntry($id) returned 1 as expected.");
		42
		43	open my $fh,">",($file->{filepath});
		44	print $fh "";
		45	close $fh;
		46
		47	ok(C4::UploadedFiles::DelUploadedFile($id)==1, "DelUploadedFile($id) returned 1.");
		48	ok(C4::UploadedFiles::DelUploadedFile($id)==-1, "DelUploadedFile($id) returned -1 as expected.");
39	ok(! -e $file->{filepath}, "File $file->{filepath} does not exist anymore");	49	ok(! -e $file->{filepath}, "File $file->{filepath} does not exist anymore");
40		50
41	is(C4::UploadedFiles::UploadFile($testfilename, '../', $testfile_fh->handle), undef, 'UploadFile with $dir containing ".." return undef');	51	is(C4::UploadedFiles::UploadFile($testfilename, '../', $testfile_fh->handle), undef, 'UploadFile with $dir containing ".." return undef');
42	-