Bug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address

[koha.git] / edithelp.pl

diff --git a/edithelp.pl b/edithelp.pl
index d4cdd5c..d1975ba 100755 (executable)
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -13,14 +13,15 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use C4::Output;
 use C4::Auth;
 use CGI;
+use warnings;
 
 use vars qw($debug);
 
@@ -30,10 +31,12 @@ BEGIN {
 
 our $input = new CGI;
 
-my $type    = $input->param('type');
-my $referer = $input->param('referer');
+my $type    = $input->param('type') || '';
+my $referer = $input->param('referer') || '';
 my $oldreferer = $referer;
-my $help    = $input->param('help');
+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 +66,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 +76,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 +85,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