X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=dac7bc4d6fb95ec96d48e860c0fcfab1421548b9;hb=dabdfec87e89ad579cf543608ad118f30981a1c5;hp=3a3d85a2d285e718437186d88f60c0f978bfcfd6;hpb=97722b7dc03c635483cf18bdeec9a8f18c1d7260;p=wfpl.git
diff --git a/run.php b/run.php
index 3a3d85a..dac7bc4 100644
--- 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
@@ -54,28 +53,28 @@
# RewriteEngine on
# RewriteRule ^$ /foo/run.php
-# RewriteRule .*\.html$ /foo/run.php
+# RewriteRule ^foo/[^/]*\.html$ /foo/run.php
+
+require_once('code/wfpl/file_run.php');
+require_once('code/wfpl/http.php');
+require_once('code/wfpl/template.php');
function run_php($basename = false) {
- if($basename) {
- $html_file = "$basename.html";
- $php_file = "$basename.php";
- } else {
- $html_file = $_SERVER['REDIRECT_URL'];
- $html_file = ereg_replace('.*/', '', $html_file);
- if($html_file == '') {
- $html_file = 'index.html';
+ if(!$basename) {
+ $basename = $_SERVER['REDIRECT_URL'];
+ $basename = ereg_replace('.*/', '', $basename);
+ $basename = ereg_replace('\.html$', '', $basename);
+ if($basename == '') {
+ $basename = 'index';
}
- $php_file = ereg_replace('\.html$', '.php', $html_file);
}
- 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;
- if(file_exists($html_file)) tem_output();
- } else {
+
+ $html_file = "$basename.html";
+ $php_file = "$basename.php";
+
+ if(!file_exists($php_file)) {
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')) {
@@ -84,6 +83,45 @@ function run_php($basename = false) {
echo '404404 File Not Found
';
}
}
+ exit();
+ }
+
+ if(file_exists($html_file)) {
+ $GLOBALS['wfpl_template'] = new tem();
+ tem_load($html_file);
+ }
+
+ $other = file_run($php_file);
+ if($other) {
+ if(strpos($other, ':')) {
+ redirect($other);
+ exit();
+ }
+ run_php($other);
+ return;
+ }
+
+ if($GLOBALS['wfpl_template']) {
+ if(file_exists('template.html')) {
+ $tem = new tem();
+ $tem->load("template.html");
+ $sections = tem_top_subs();
+ if($sections) foreach($sections as $name => $val) {
+ $tem->set($name, $val);
+ }
+
+ if(file_exists("$basename.css")) {
+ $tem->set('css_link', "$basename.css");
+ $tem->sub('css_links');
+ }
+
+ $GLOBALS['wfpl_template'] = $tem;
+ }
+
+ if(function_exists('display_messages')) {
+ display_messages();
+ }
+ tem_output();
}
}