From 23dfbcc20fc6d20fb5be211e5af50cdcb8565c8e Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Mon, 2 Mar 2015 19:03:35 -0500 Subject: [PATCH] API CHANGE s/run_php/wfpl_main/ --- main.php | 148 +++++++++++++++++++++++++++++++++++++++++++++ metaform.php | 29 ++++----- metaform/htaccess | 16 ++--- run.php | 174 ----------------------------------------------------- 4 files changed, 165 insertions(+), 202 deletions(-) create mode 100644 main.php delete mode 100644 run.php diff --git a/main.php b/main.php new file mode 100644 index 0000000..e088d67 --- /dev/null +++ b/main.php @@ -0,0 +1,148 @@ +load("template.html"); + $GLOBALS['wfpl_main_template']->set('$basename', $basename); + } + + # cms_get can return one of: + # 1) true to indicate that there is cms content (so no 404) + # 2) false to indicate that there's no cms content for this basename + # 3) a string to indicate a soft/full redirect just as foo_main() + if(function_exists('cms_display')) { + $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']); + if(is_string($cms_content)) { + run_php($cms_content); + return; + } + } else { + $cms_content = false; + } + + if(!$php_exists && !$html_exists && !$cms_content) { + header('HTTP/1.0 404 File Not Found'); + if(file_exists('error_404.php') || file_exists('error_404.html')) { + $GLOBALS['error_basename'] = $basename; + run_php('error_404'); + return; + } else { + echo '404

404 File Not Found

'; + exit(); + } + } + + # If there's no template.html we don't want to parse $html_file. + if($html_exists && !$php_exists && !file_exists('template.html')) { + readfile($html_file); + exit(); + } + + if($html_exists) { + tem_load_new($html_file); + } + + if($php_exists) { + # files can return a basename or URL of a page to be run/displayed + $other = file_run($php_file); + if($other) { + run_php($other); + return; + } + } elseif($html_exists) { + $sub_names = tem_top_sub_names(); + foreach($sub_names as $sub_name) { + tem_sub($sub_name); + } + } + + # Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script. + if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) { + if($GLOBALS['wfpl_main_template']) { + # if there was a template for that page, and one for the whole + # site, copy all template sections that have been show()n to the + # site-wide template + if($GLOBALS['wfpl_template']) { + $GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']); + } + + $GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template']; + } + + + # You'll probably want to require_once(__DIR__.'/'.'code/wfpl/messages.php') or + # require_once(__DIR__.'/'.'code/wfpl/session_messages.php') in code/config.php + if(function_exists('display_messages')) { + if(function_exists('atexit_now')) { + atexit_now(); + } + display_messages(); + } + + tem_output(); + } +} diff --git a/metaform.php b/metaform.php index 2be93ea..ad980a6 100644 --- a/metaform.php +++ b/metaform.php @@ -95,7 +95,7 @@ function tem_set_globals(&$tem) { } } -function metaform() { +function metaform_main() { if(isset($_REQUEST['singular'])) { $GLOBALS['file_name'] = format_varname($_REQUEST['file_name']); $GLOBALS['table_name'] = format_varname($_REQUEST['table_name']); @@ -153,9 +153,10 @@ function metaform() { set_form_action(); - tem_load('code/wfpl/metaform/main.html'); + tem_load(__DIR__.'/'.'metaform/main.html'); list_available_types(); tem_output(); + exit(); # in case we're being called by wfpl_main or something } @@ -254,7 +255,7 @@ function view_headers() { function make_sql() { $tem = new tem(); - $tem->load('code/wfpl/metaform/template.sql'); + $tem->load(__DIR__.'/'.'metaform/template.sql'); tem_set_globals($tem); $fields = get_fields(); foreach($fields as $field) { @@ -297,7 +298,7 @@ function find_always_field(&$fields) { function make_html($whole_file = true) { $has_html_editors = false; $tem = new tem(); - $tem->load('code/wfpl/metaform/template.html'); + $tem->load(__DIR__.'/'.'metaform/template.html'); tem_set_globals($tem); $fields = get_fields(); $tem->set('always_field', find_always_field($fields)); @@ -443,7 +444,7 @@ function pulldown_options_array($options) { function make_php() { $has_html_editors = false; $tem = new tem(); - $tem->load('code/wfpl/metaform/template.php'); + $tem->load(__DIR__.'/'.'metaform/template.php'); tem_set_globals($tem); $fields = get_fields(); $db_fields = ''; @@ -540,7 +541,7 @@ function view_php() { function make_email() { $tem = new tem(); - $tem->load('code/wfpl/metaform/template.email.txt'); + $tem->load(__DIR__.'/'.'metaform/template.email.txt'); tem_set_globals($tem); $fields = get_fields(); foreach($fields as $field) { @@ -561,7 +562,7 @@ function make_email() { function make_htaccess() { $tem = new tem(); $tem->set('form', $GLOBALS['file_name']); - return $tem->run('code/wfpl/metaform/htaccess'); + return $tem->run(__DIR__.'/'.'metaform/htaccess'); } function view_email() { @@ -570,7 +571,7 @@ function view_email() { } function preview() { - tem_load('code/wfpl/metaform/preview.html'); + tem_load(__DIR__.'/'.'metaform/preview.html'); tem_set_globals($GLOBALS['wfpl_template']); tem_set('fields', $_REQUEST['fields']); $preview_tem = new tem(); @@ -597,11 +598,11 @@ function download_tar() { $admin_name = $GLOBALS['file_name']; $nice_name = $GLOBALS['public_file_name']; $files = array( - "INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'), + "INSTALL" => read_whole_file(__DIR__.'/'.'metaform/INSTALL'), ".htaccess" => make_htaccess(), - "run.php" => " read_whole_file('code/wfpl/metaform/styl.styl'), - "template.html" => read_whole_file('code/wfpl/metaform/site-template.html'), + "config.php" => " read_whole_file(__DIR__.'/'.'metaform/styl.styl'), + "template.html" => read_whole_file(__DIR__.'/'.'metaform/site-template.html'), "$admin_name.html" => make_html(), "$admin_name.php" => make_php()); if($GLOBALS['opt_public_something']) { @@ -616,7 +617,3 @@ function download_tar() { } make_tar($nice_name, $files); } - - -metaform(); -exit(); diff --git a/metaform/htaccess b/metaform/htaccess index 517f638..de9356a 100644 --- a/metaform/htaccess +++ b/metaform/htaccess @@ -12,23 +12,15 @@ AddDefaultCharset UTF-8 ExpiresDefault A31536000 -# the following line makes it so you can just update the link to your -# stylesheet without actually renaming it all the time. This is needed even if -# you don't set a long cache period on stylesheets, because Safari will check -# for a new html, but not check for a new css. -RewriteRule ^style_[0-9]*.less$ /style.less [L] - - # To enable larger uploads, you'll need both of these: # php_value post_max_size 205M # php_value upload_max_filesize 200M ############ START OF PRETTY URLS SETTINGS ############ -# This section contains directives to enable pretty URLs, and instruct apache -# to run wfpl on them. This runs code/config.php if it exists, then loads -# templates, then loads the php file, and call's it's main function. See -# code/wfpl/run.php and code/wfpl/README for more details. +# This section contains directives to enable pretty URLs, including setting +# page urls to run your site-wide config file, which in turn can run +# wfpl_main() # To have "pretty" urls (no file extension at the end) we use mod_rewrite. But # first we've got to disable a couple url-mangling features of apache that take @@ -42,7 +34,7 @@ RewriteEngine on # Unfortunately, the rewrite rules only work with absolute paths, so if your # files are not at the top level of the domain, you'll have to customize this # part. Here's the config for running at the top level: -RewriteRule ^[^/.]*$ /run.php +RewriteRule ^[^/.]*$ /config.php # use this line instead if you have this (.htaccess) file and your php and html # files in the ~form~ directory: diff --git a/run.php b/run.php deleted file mode 100644 index 8cf9d4d..0000000 --- a/run.php +++ /dev/null @@ -1,174 +0,0 @@ -load("template.html"); - $GLOBALS['wfpl_main_template']->set('$basename', $basename); - } - - # cms_get can return one of: - # 1) true to indicate that there is cms content (so no 404) - # 2) false to indicate that there's no cms content for this basename - # 3) a string to indicate a soft/full redirect just as foo_main() - if(function_exists('cms_display')) { - $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']); - if(is_string($cms_content)) { - run_php($cms_content); - return; - } - } else { - $cms_content = false; - } - - if(!$php_exists && !$html_exists && !$cms_content) { - header('HTTP/1.0 404 File Not Found'); - if(file_exists('error_404.php') || file_exists('error_404.html')) { - $GLOBALS['error_basename'] = $basename; - run_php('error_404'); - return; - } else { - echo '404

404 File Not Found

'; - exit(); - } - } - - # If there's no template.html we don't want to parse $html_file. - if($html_exists && !$php_exists && !file_exists('template.html')) { - readfile($html_file); - exit(); - } - - if($html_exists) { - tem_load_new($html_file); - } - - if($php_exists) { - # files can return a basename or URL of a page to be run/displayed - $other = file_run($php_file); - if($other) { - run_php($other); - return; - } - } elseif($html_exists) { - $sub_names = tem_top_sub_names(); - foreach($sub_names as $sub_name) { - tem_sub($sub_name); - } - } - - # Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script. - if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) { - if($GLOBALS['wfpl_main_template']) { - # if there was a template for that page, and one for the whole - # site, copy all template sections that have been show()n to the - # site-wide template - if($GLOBALS['wfpl_template']) { - $GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']); - } - - $GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template']; - } - - - # You'll probably want to require_once(__DIR__.'/'.'code/wfpl/messages.php') or - # require_once(__DIR__.'/'.'code/wfpl/session_messages.php') in code/config.php - if(function_exists('display_messages')) { - if(function_exists('atexit_now')) { - atexit_now(); - } - display_messages(); - } - - tem_output(); - } -} - -run_php(); - -?> -- 1.7.10.4