From: Jason Woofenden <jason@jasonwoof.com>
Date: Mon, 22 Jun 2015 22:06:09 +0000 (-0400)
Subject: make all require()s jumpable
X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl-cms.git;a=commitdiff_plain;h=abf27e3dd23a8fb52d766be615ebaa19a9dfc389

make all require()s jumpable
---

diff --git a/admin.php b/admin.php
index c2d1935..f78b84b 100644
--- a/admin.php
+++ b/admin.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(INC_WFPL . 'session.php');
+require_once(DOCROOT . 'inc/wfpl/session.php');
 
 function admin_main() {
 	if(!logged_in_as_admin()) {
diff --git a/admin_admins.php b/admin_admins.php
index 420faf3..6a8f0c4 100644
--- a/admin_admins.php
+++ b/admin_admins.php
@@ -5,8 +5,8 @@
 define('ADMIN_ADMINS_DB_FIELDS', 'name,username,password,privs');
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'email.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/email.php');
 
 function admin_admins_get_fields() {
 	$data = array();
diff --git a/admin_files.php b/admin_files.php
index db70f86..98c98e3 100644
--- a/admin_files.php
+++ b/admin_files.php
@@ -12,9 +12,9 @@ $GLOBALS['upload_directory'] = 'files/';
 $GLOBALS['filename_file_name'] = uniqid() . getmypid() . '.txt';
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'email.php');
-require_once(INC_WFPL . 'upload.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/email.php');
+require_once(DOCROOT . 'inc/wfpl/upload.php');
 
 function admin_files_get_fields() {
 	$data = array();
diff --git a/admin_images.php b/admin_images.php
index 3635b24..9930889 100644
--- a/admin_images.php
+++ b/admin_images.php
@@ -15,8 +15,8 @@ $GLOBALS['image_thumb_max_height'] = '70';
 $GLOBALS['image_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'upload.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/upload.php');
 
 # example: 200x300
 function format_width_height($str) {
diff --git a/admin_pages.php b/admin_pages.php
index f712444..7769d73 100644
--- a/admin_pages.php
+++ b/admin_pages.php
@@ -5,8 +5,8 @@
 define('ADMIN_PAGES_DB_FIELDS', 'title,filename,navbar,nav_title,content,description,keywords');
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'email.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/email.php');
 
 function format_cms_filename($str) {
 	$str = format_filename($str);
diff --git a/config.php b/config.php
index 8a52bf4..5be892e 100644
--- a/config.php
+++ b/config.php
@@ -1,5 +1,7 @@
 <?php
 
+# This file should be run automatically by wfpl_main.php
+
 # Settings
 define('WFPL_DB', 'fixme');
 define('WFPL_DB_USER', 'fixme');
@@ -8,10 +10,10 @@ define('WFPL_DB_PASS', 'fixme');
 date_default_timezone_set('America/New_York');
 
 # Enable features, auto-includes
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'db.php');
-require_once(INC_WFPL . 'session_messages.php');
-require_once(__DIR__.'/'.'inc/cms.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/db.php');
+require_once(DOCROOT . 'inc/wfpl/session_messages.php');
+require_once(DOCROOT . 'inc/cms.php');
 
 # Connect to the database
 db_connect(WFPL_DB, WFPL_DB_USER, WFPL_DB_PASS);
diff --git a/contact.php b/contact.php
index 5d9c233..00176d7 100644
--- a/contact.php
+++ b/contact.php
@@ -9,8 +9,8 @@ $GLOBALS['contact_form_recipient'] = 'fixme@example.com';
 $GLOBALS['contact_robot_answer'] = 1002;
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'email.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/email.php');
 
 function contact_get_fields() {
 	$data = array();
diff --git a/wfpl_main.php b/wfpl_main.php
index 86b0693..ecc2acc 100644
--- a/wfpl_main.php
+++ b/wfpl_main.php
@@ -1,9 +1,10 @@
 <?php
 
+# This file should be run automatically by .htaccess
+
 define('DOCROOT', __DIR__ .'/');
-define('INC_WFPL', DOCROOT . 'inc/wfpl/');
 
 require_once(DOCROOT . 'config.php');
 
-require_once(INC_WFPL . 'main.php');
+require_once(DOCROOT . 'inc/wfpl/main.php');
 wfpl_main();