X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=edithelp.pl;h=d1975ba6707c9b61910a3da4de38546222d2caff;hb=4dc85d2f0a7b8fb682fb0f492cc06c8f1a16bc31;hp=0d20d7d7d0de0bfe557425bde5babd32b910307a;hpb=154a01077a471bddcebf2b4557c10a8010f4d5f6;p=koha.git diff --git a/edithelp.pl b/edithelp.pl index 0d20d7d7d0..d1975ba670 100755 --- a/edithelp.pl +++ b/edithelp.pl @@ -13,21 +13,30 @@ # 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; -my $input = new CGI; +use vars qw($debug); -my $type = $input->param('type'); -my $referer = $input->param('referer'); +BEGIN { + $debug = $ENV{DEBUG} || 0; +} + +our $input = new CGI; + +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( @@ -52,77 +61,56 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); +sub _get_filepath ($;$) { + my $referer = shift; + $referer =~ /.*koha\/(.+)\.pl.*/; + my $from = "help/$1.tmpl"; + my $htdocs = C4::Context->config('intrahtdocs'); + 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"; +} + if ( $type eq 'addnew' ) { $type = 'create'; } elsif ( $type eq 'create' || $type eq 'save' ) { - $referer =~ /.*koha\/(.*)\.pl.*/; - my $from = "help/$1.tmpl"; - my $htdocs = C4::Context->config('intrahtdocs'); -# my ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet" ); - my $theme = C4::Context->preference('template'); - my $lang = C4::Context->preference('language') || 'en'; - - # if (! -e "$htdocs/$theme/$lang/$from") { - # doesnt exist - eval { - open( OUTFILE, ">$htdocs/$theme/$lang/modules/$from" ) || die "Can't open file"; - }; - if ($@) { - $error = "Cant open file $htdocs/$theme/$lang/modules/$from"; - } - else { - + my $file = _get_filepath($referer); + 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 "\n"; - if ($type eq 'create'){ - print OUTFILE "