X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=edithelp.pl;h=32db0622915cd56b101fa9ef0e2aee663c0cf46a;hb=518710878972a72b8d7b306af571b7c543267ddd;hp=362f678e86045c61b70bd813f17444a07c361152;hpb=b5ab0da999b892237026947017f170d5f001e732;p=koha_fer

diff --git a/edithelp.pl b/edithelp.pl
index 362f678e86..32db062291 100755
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -13,14 +13,16 @@
 # 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::Templates;
 use C4::Auth;
 use CGI;
+use warnings;
 
 use vars qw($debug);
 
@@ -30,17 +32,17 @@ 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(
     {
-        template_name   => "help/edithelp.tmpl",
+        template_name   => "help/edithelp.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -62,29 +64,30 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 sub _get_filepath ($;$) {
     my $referer = shift;
-    $referer =~ /.*koha\/(.+)\.pl.*/;
-    my $from   = "help/$1.tmpl";
+    $referer =~ /koha\/(.*)\.pl/;
+    my $from = "help/$1.tt";
     my $htdocs = C4::Context->config('intrahtdocs');
-    my ($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input );
+    my ($theme, $lang) = C4::Templates::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' ) {
+$type = 'create' if $type eq 'addnew';
+if ( $type eq 'create' || $type eq 'save' ) {
 	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
+    open my $fh, ">", $file;
+    if ( $fh ) {
         # 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;
-        print OUTFILE "\n<!-- TMPL_INCLUDE NAME=\"help-bottom.inc\" -->\n";
-        close OUTFILE;
+        print $fh
+            " [% INCLUDE 'help-top.inc' %]\n",
+		    $type eq 'create' ? "<div class=\"main\">\n$help\n</div>" : $help,
+            "\n[% INCLUDE 'help-bottom.inc' %]\n";
+        close $fh;
 		print $input->redirect("/cgi-bin/koha/help.pl?url=$oldreferer");
     }
-    
+    else {
+        $error = "Cannot write file: '$file'";
+    }
 }
 elsif ( $type eq 'modify' ) {
     # open file load data, kill include calls, pass data to the template
@@ -97,7 +100,7 @@ elsif ( $type eq 'modify' ) {
     	open (INFILE, $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
 		my $help = '';
 		while ( my $inp = <INFILE> ) {
-			unless ( $inp =~ /TMPL\_INCLUDE/ ) {
+			unless ( $inp =~ /INCLUDE/ ) {
 				$help .= $inp;
 			}
 		}