JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
no dashes in filenames, improved image uploading, make_thumbnail()
[wfpl.git] / run.php
diff --git a/run.php b/run.php
index 20b3111..dac7bc4 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
 
 # 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);
-               $other = file_run($php_file);
-               if($other) {
-                       run_php($other);
-                       return;
-               }
-               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)) {
                        readfile($html_file);
                } else {
@@ -90,6 +83,45 @@ function run_php($basename = false) {
                                echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
                        }
                }
+               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();
        }
 }