Changeset 742

Timestamp:

11/16/08 20:26:12 (3 years ago)

Author:

OlivierRaginel

Message:

Item38: Make use of sandbox

Location:

trunk

Files:

• EmbedBibPlugin/lib/TWiki/Plugins/EmbedBibPlugin.pm (modified) (2 diffs)
• GenPDFLatexAddOn/lib/TWiki/Contrib/GenPDFLatex.pm (modified) (2 diffs)

trunk/EmbedBibPlugin/lib/TWiki/Plugins/EmbedBibPlugin.pm

@@ -172 +172 @@
     }
 
-
+    my $sandbox = $TWiki::sharedSandbox || $TWiki::sandbox;
     if ( $Style eq "bibtex" )
     {
-        return `$bibtoolcommand`;
+        return $sandbox->sysCommand( $bibtoolcommand );
     }
     elsif ( $Style eq "html" )
@@ -211 +211 @@
         # input from stdin
         open(TMPFILE, ">$tmpBibFile") or return "EMBEDBIB Error: fatal error";
-        my $tmpOut = `$bibtoolcommand`;
+        my $tmpOut = $sandbox->sysCommand( $bibtoolcommand );
         print TMPFILE $tmpOut;
         print TMPFILE $bibtex2htmlConf;
-
-        return `$bibtex2htmlPath $tmpBibFile $bibtex2htmlArgs `;
+        close TMPFILE;
+
+        $tmpOut = $sandbox->sysCommand( "$bibtex2htmlPath $tmpBibFile $bibtex2htmlArgs" );
+        unlink $tmpBibFile;
+        return $tmpOut;
     }
 }

trunk/GenPDFLatexAddOn/lib/TWiki/Contrib/GenPDFLatex.pm

@@ -209 +209 @@
         # create a temporary working directory
         my $WDIR = File::Temp::tempdir();
-        `chmod a+rwx $WDIR` if ($debug);
 
         my $latexfile = $WDIR.'/lmp_content.tex';
@@ -236 +235 @@
         my $ret = "";
         do {
-            $ret = `$pdflatex -interaction=nonstopmode $texrel`;
-            $ret .= `$bibtex $base` if ($tex =~ m/\\bibliography\{/);
+            my $sandbox = $TWiki::sharedSandbox || $TWiki::sandbox;
+            my ($result, $code) = $sandbox->sysCommand( "$pdflatex -interaction=nonstopmode $texrel" );
+            $ret = $result;
+            if( $tex =~ m/\\bibliography\{/ ) {
+              ($result, $code) = $sandbox->sysCommand( "$bibtex $base" );
+              $ret .= $result;
+            }
             $flag++ unless ($ret =~ m/Warning.*?Rerun/i);
         } while ($flag < 2);