jimw            Mon Dec 17 17:53:19 2001 EDT

  Modified files:              
    /phpdoc/en/functions        exec.xml 
  Log:
  format notes using <note> and <warning> as appropriate
  
Index: phpdoc/en/functions/exec.xml
diff -u phpdoc/en/functions/exec.xml:1.24 phpdoc/en/functions/exec.xml:1.25
--- phpdoc/en/functions/exec.xml:1.24   Sat Dec 15 09:35:26 2001
+++ phpdoc/en/functions/exec.xml        Mon Dec 17 17:53:19 2001
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
  <reference id="ref.exec">
   <title>Program Execution functions</title>
   <titleabbrev>Program Execution</titleabbrev>
@@ -139,19 +139,23 @@
      return status of the executed command will be written to this
      variable.
     </para>
-    <para>
-     Note that if you are going to allow data coming from user input
-     to be passed to this function, then you should be using
-     <function>escapeshellcmd</function> to make sure that users
-     cannot trick the system into executing arbitrary commands.
-    </para>
-    <para>
-     Note also that if you start a program using this function and
-     want to leave it running in the background, you have to make
-     sure that the output of that program is redirected to a file or
-     some other output stream or else PHP will hang until the
-     execution of the program ends.
-    </para>
+    <warning>
+     <para>
+      If you are going to allow data coming from user input to be passed to
+      this function, then you should be using
+      <function>escapeshellarg</function> or
+      <function>escapeshellcmd</function> to make sure that users cannot trick
+      the system into executing arbitrary commands.
+     </para>
+    </warning>
+    <note>
+     <para>
+      If you start a program using this function and want to leave it running
+      in the background, you have to make sure that the output of that program
+      is redirected to a file or some other output stream or else PHP will
+      hang until the execution of the program ends.
+     </para>
+    </note>
     <para>
      See also <function>system</function>,
      <function>passthru</function>, <function>popen</function>,
@@ -192,14 +196,25 @@
      pbmplus utilities that can output an image stream directly.  By
      setting the Content-type to <emphasis>image/gif</emphasis> and
      then calling a pbmplus program to output a gif, you can create
-     PHP scripts that output images directly.</para>
-    <para>
-     Note that if you start a program using this function and want to
-     leave it running in the background, you have to make sure that the
-     output of that program is redirected to a file or some other
-     output stream or else PHP will hang until the execution of the
-     program ends.
+     PHP scripts that output images directly.
     </para>
+    <warning>
+     <para>
+      If you are going to allow data coming from user input to be passed to
+      this function, then you should be using
+      <function>escapeshellarg</function> or
+      <function>escapeshellcmd</function> to make sure that users cannot trick
+      the system into executing arbitrary commands.
+     </para>
+    </warning>
+    <note>
+     <para>
+      If you start a program using this function and want to leave it running
+      in the background, you have to make sure that the output of that program
+      is redirected to a file or some other output stream or else PHP will
+      hang until the execution of the program ends.
+     </para>
+    </note>
     <para>
      See also <function>exec</function>, <function>system</function>,
      <function>popen</function>, <function>escapeshellcmd</function>,
@@ -233,20 +248,23 @@
      status code of the executed command will be written to this
      variable.
     </para>
-    <para>
-     Note, that if you are going to allow data coming from user input
-     to be passed to this function, then you should be using the
-     <function>escapeshellcmd</function> function to make sure that
-     users cannot trick the system into executing arbitrary
-     commands.
-    </para>
-    <para>
-     Note also that if you start a program using this function and want
-     to leave it running in the background, you have to make sure that
-     the output of that program is redirected to a file or some other
-     output stream or else PHP will hang until the execution of the
-     program ends.
-    </para>
+    <warning>
+     <para>
+      If you are going to allow data coming from user input to be passed to
+      this function, then you should be using
+      <function>escapeshellarg</function> or
+      <function>escapeshellcmd</function> to make sure that users cannot trick
+      the system into executing arbitrary commands.
+     </para>
+    </warning>
+    <note>
+     <para>
+      If you start a program using this function and want to leave it running
+      in the background, you have to make sure that the output of that program
+      is redirected to a file or some other output stream or else PHP will
+      hang until the execution of the program ends.
+     </para>
+    </note>
     <para>
      The <function>system</function> call also tries to automatically
      flush the web server's output buffer after each line of output if


Reply via email to