changed licence to lgpl, metaform includes wfpl in tarbal

[wfpl.git] / run.php

diff --git a/run.php b/run.php
index d3fab6b..79a05dc 100644 (file)
--- a/run.php
+++ b/run.php
@@ -4,20 +4,19 @@
 #
 #  This file is part of wfpl.
 #
-#  wfpl is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  wfpl is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
 #  any later version.
 #
-#  wfpl is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
+#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+#  more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with wfpl; see the file COPYING.  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 Lesser General Public License
+#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
+#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 # This file facilitates making a site with mixed PHP and html files. All URLs
@@ -53,7 +52,10 @@
 # http://example.com/foo/bar.html
 
 # RewriteEngine  on
-# RewriteRule    .*\.html$  /foo/run.php
+# RewriteRule    ^$  /foo/run.php
+# RewriteRule    ^/foo/[^/]*\.html$  /foo/run.php
+
+require_once('code/wfpl/file_run.php');
 
 function run_php($basename = false) {
        if($basename) {
@@ -70,11 +72,15 @@ function run_php($basename = false) {
        if($php_file != $html_file && file_exists($php_file)) {
                require_once('code/wfpl/template.php');
                if(file_exists($html_file)) tem_load($html_file);
-               require $php_file;
+               $other = file_run($php_file);
+               if($other) {
+                       run_php($other);
+                       return;
+               }
                if(file_exists($html_file)) tem_output();
        } else {
                if(file_exists($html_file)) {
-                       require $html_file;
+                       readfile($html_file);
                } else {
                        header('HTTP/1.0 404 File Not Found');
                        if(file_exists('404.php') || file_exists('404.html')) {