X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=c5ae240daf78dd08ddbc6199fc1e32da81891ac0;hb=74fac1cb550d6a337c67cabdcfae4ad26e34f422;hp=03d849afb636727f2ce6643556b539633eb8a358;hpb=d03e8554ee3e80a6333126e67dd4c20f54ec700e;p=wfpl.git diff --git a/run.php b/run.php index 03d849a..c5ae240 100644 --- a/run.php +++ b/run.php @@ -57,36 +57,22 @@ 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)) { - $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(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 { @@ -97,6 +83,46 @@ function run_php($basename = false) { echo '