X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=run.php;h=24072029821ecc46929272b9cf8a7dce902e9435;hb=004d7c622549f56ea0bcc81b0cde9c18d8f35f46;hp=8d8d1dfcda0fd6db30d58d2bf068b413a60fba0a;hpb=15fa6e23941fd5497ca19266adaede5c19e3836a;p=wfpl.git diff --git a/run.php b/run.php index 8d8d1df..2407202 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 @@ -53,37 +52,105 @@ # http://example.com/foo/bar.html # RewriteEngine on -# RewriteBase /foo/ -# RewriteRule .*\.html$ /foo/run.php +# RewriteRule ^$ /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'); + +if(file_exists('code/config.php')) { + file_run('code/config.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(); + + $html_file = "$basename.html"; + $php_file = "$basename.php"; + + $html_exists = file_exists($html_file); + $php_exists = file_exists($php_file); + + if(function_exists('cms_get')) { + $cms_content = cms_get($basename); } else { - if(file_exists($html_file)) { - require $html_file; + $cms_content = false; + } + + if(!$php_exists && !$html_exists && !$cms_content) { + header('HTTP/1.0 404 File Not Found'); + if(file_exists('404.php') || file_exists('404.html')) { + run_php('404'); } else { - header('HTTP/1.0 404 File Not Found'); - if(file_exists('404.php') || file_exists('404.html')) { - run_php('404'); - } else { - echo '