X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=edithelp.pl;h=362f678e86045c61b70bd813f17444a07c361152;hb=4fdbc3a89cfc63d2c68e998e3453ad96ffc2ecc1;hp=d4cdd5c91d1decf00c430575834a79dd2c08cd81;hpb=536b855b909d7b5a8662475190bb2779ce2ecc7f;p=koha.git

diff --git a/edithelp.pl b/edithelp.pl
index d4cdd5c91d..362f678e86 100755
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -34,6 +34,8 @@ my $type    = $input->param('type');
 my $referer = $input->param('referer');
 my $oldreferer = $referer;
 my $help    = $input->param('help');
+# strip any DOS-newlines that TinyMCE may have sneaked in
+$help =~ s/\r//g;
 my $error;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -63,14 +65,7 @@ sub _get_filepath ($;$) {
     $referer =~ /.*koha\/(.+)\.pl.*/;
     my $from   = "help/$1.tmpl";
     my $htdocs = C4::Context->config('intrahtdocs');
-	my ($theme, $lang);
-	# This split behavior was part of the old script.  I'm not sure why.  -atz
-	if (@_) {
-		($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input );
-	} else {
-		$theme = C4::Context->preference('template');
-   		$lang  = C4::Context->preference('language') || 'en';
-	}
+    my ($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input );
 	$debug and print STDERR "help filepath: $htdocs/$theme/$lang/modules/$from";
 	return "$htdocs/$theme/$lang/modules/$from";
 }
@@ -80,10 +75,8 @@ if ( $type eq 'addnew' ) {
 }
 elsif ( $type eq 'create' || $type eq 'save' ) {
 	my $file = _get_filepath($referer);
-	if (! -w $file) {
-		$error = "Cannot write file: '$file'";
-    } else {
-        open (OUTFILE, ">$file") or die "Cannot write file: '$file'";	# unlikely death, since we just checked
+	unless (open (OUTFILE, ">$file")) {$error = "Cannot write file: '$file'";} else {
+        #open (OUTFILE, ">$file") or die "Cannot write file: '$file'";	# unlikely death, since we just checked
         # file is open write to it
         print OUTFILE "<!-- TMPL_INCLUDE NAME=\"help-top.inc\" -->\n";
 		print OUTFILE ($type eq 'create') ? "<div class=\"main\">\n$help\n</div>" : $help;
@@ -91,6 +84,7 @@ elsif ( $type eq 'create' || $type eq 'save' ) {
         close OUTFILE;
 		print $input->redirect("/cgi-bin/koha/help.pl?url=$oldreferer");
     }
+    
 }
 elsif ( $type eq 'modify' ) {
     # open file load data, kill include calls, pass data to the template