From 00f6a232f1a6022f53f4e3c9d0236d81db966b62 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Mon, 2 Mar 2015 19:04:14 -0500
Subject: [PATCH] use sensible paths for config, wfpl, etc

---
 .htaccess       |    2 +-
 code/ckeditor   |    1 -
 code/cms.php    |   54 -----------------------------------------------------
 code/config.php |   15 ---------------
 code/wfpl       |    1 -
 config.php      |   21 +++++++++++++++++++++
 inc/ckeditor    |    1 +
 inc/cms.php     |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 inc/wfpl        |    1 +
 run.php         |    3 ---
 10 files changed, 80 insertions(+), 75 deletions(-)
 delete mode 160000 code/ckeditor
 delete mode 100644 code/cms.php
 delete mode 100644 code/config.php
 delete mode 160000 code/wfpl
 create mode 100644 config.php
 create mode 160000 inc/ckeditor
 create mode 100644 inc/cms.php
 create mode 160000 inc/wfpl
 delete mode 100644 run.php

diff --git a/.htaccess b/.htaccess
index e8dd622..6d04476 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,7 +7,7 @@ DirectorySlash Off
 DirectoryIndex disabled
 AddDefaultCharset UTF-8
 RewriteEngine  on
-RewriteRule    ^[^/.]*$  /run.php [L]
+RewriteRule    ^[^/.]*$  /config.php [L]
 
 <FilesMatch "\.(css|jpg|png)$">
 	ExpiresActive On
diff --git a/code/ckeditor b/code/ckeditor
deleted file mode 160000
index 749be88..0000000
--- a/code/ckeditor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 749be886bb4b0ebf70be13397f2279d5446cd0c8
diff --git a/code/cms.php b/code/cms.php
deleted file mode 100644
index e2ef7d9..0000000
--- a/code/cms.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-function cms_display($basename, &$tem) {
-	if(preg_match('/([.]l(ocal)?$)|^192[.]168[.]|^127.0.0.1$|^10[.]/', $_SERVER['HTTP_HOST'])) {
-		$GLOBALS['wfpl_main_template']->set('$running_locally');
-	}
-	$tem->set('$host', this_host());
-	$nav_items = db_get_assocs('cms_pages', "coalesce(nullif(nav_title,''), title) as title,filename", 'where navbar!=0 order by navbar');
-	if($nav_items) {
-		foreach($nav_items as &$item) {
-			$item['basename'] = $item['filename']; # for nav-links as images
-			if($item['filename'] == $basename) {
-				$item['current'] = true;
-			}
-			if($item['filename'] == 'index') {
-				$item['filename'] = './';
-			}
-			if($item['title'] == '') {
-				$item['title'] = '(untitled)';
-			}
-		}
-		$tem->set('$navbar_items', $nav_items);
-	}
-
-	$cms_page_id = cms_display_content($tem, 'where filename=%"', $basename);
-
-	if(logged_in_as_admin()) {
-		$admin_links = array();
-		if($cms_page_id) {
-			$admin_links['id'] = $cms_page_id;
-		}
-		$tem->set('$admin_links', $admin_links);
-	}
-
-	if($cms_page_id) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function cms_display_content(&$tem /*, 'where clause %", %i', string, int */) {
-	$args = array_slice(func_get_args(), 1);
-	$args = array_merge(array('cms_pages', 'id,title,keywords,description,content'), $args);
-	$row = call_user_func_array('db_get_assoc', $args);
-	if($row) {
-		$tem->set('$cms_title', $row['title']);
-		$tem->set('$meta_keywords', $row['keywords']);
-		$tem->set('$meta_description', $row['description']);
-		$tem->set('$cms_body', $row['content']);
-		return $row['id'];
-	}
-	return false;
-}
diff --git a/code/config.php b/code/config.php
deleted file mode 100644
index 6c873b0..0000000
--- a/code/config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-define('WFPL_DB', 'fixme');
-define('WFPL_DB_USER', 'fixme');
-define('WFPL_DB_PASS', 'fixme');
-# CMS login passwords are stored in the database. See admin_admins.php
-date_default_timezone_set('America/New_York');
-
-
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/db.php');
-require_once('code/wfpl/session_messages.php');
-require_once('code/cms.php');
-
-db_connect(WFPL_DB, WFPL_DB_USER, WFPL_DB_PASS);
diff --git a/code/wfpl b/code/wfpl
deleted file mode 160000
index c2f9548..0000000
--- a/code/wfpl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c2f95486e25b8fb95aa1b070189815487eadc276
diff --git a/config.php b/config.php
new file mode 100644
index 0000000..1dc9d0d
--- /dev/null
+++ b/config.php
@@ -0,0 +1,21 @@
+<?php
+
+# Settings
+define('WFPL_DB', 'fixme');
+define('WFPL_DB_USER', 'fixme');
+define('WFPL_DB_PASS', 'fixme');
+# CMS login passwords are stored in the database. See admin_admins.php
+date_default_timezone_set('America/New_York');
+
+# Enable features, auto-includes
+require_once(__DIR__.'/'.'inc/wfpl/format.php');
+require_once(__DIR__.'/'.'inc/wfpl/db.php');
+require_once(__DIR__.'/'.'inc/wfpl/session_messages.php');
+require_once(__DIR__.'/'.'inc/cms.php');
+
+# Connect to the database
+db_connect(WFPL_DB, WFPL_DB_USER, WFPL_DB_PASS);
+
+# Load the requested page (php and/or html)
+require_once(__DIR__.'/'.'inc/wfpl/main.php');
+wfpl_main();
diff --git a/inc/ckeditor b/inc/ckeditor
new file mode 160000
index 0000000..749be88
--- /dev/null
+++ b/inc/ckeditor
@@ -0,0 +1 @@
+Subproject commit 749be886bb4b0ebf70be13397f2279d5446cd0c8
diff --git a/inc/cms.php b/inc/cms.php
new file mode 100644
index 0000000..0116c37
--- /dev/null
+++ b/inc/cms.php
@@ -0,0 +1,56 @@
+<?php
+
+# This function (which loads the navbar and page content from the database) is
+# called automatically by wfpl_main()
+function cms_display($basename, &$tem) {
+	if(preg_match('/([.]l(ocal)?$)|^192[.]168[.]|^127.0.0.1$|^10[.]/', $_SERVER['HTTP_HOST'])) {
+		$GLOBALS['wfpl_main_template']->set('$running_locally');
+	}
+	$tem->set('$host', this_host());
+	$nav_items = db_get_assocs('cms_pages', "coalesce(nullif(nav_title,''), title) as title,filename", 'where navbar!=0 order by navbar');
+	if($nav_items) {
+		foreach($nav_items as &$item) {
+			$item['basename'] = $item['filename']; # for nav-links as images
+			if($item['filename'] == $basename) {
+				$item['current'] = true;
+			}
+			if($item['filename'] == 'index') {
+				$item['filename'] = './';
+			}
+			if($item['title'] == '') {
+				$item['title'] = '(untitled)';
+			}
+		}
+		$tem->set('$navbar_items', $nav_items);
+	}
+
+	$cms_page_id = cms_display_content($tem, 'where filename=%"', $basename);
+
+	if(logged_in_as_admin()) {
+		$admin_links = array();
+		if($cms_page_id) {
+			$admin_links['id'] = $cms_page_id;
+		}
+		$tem->set('$admin_links', $admin_links);
+	}
+
+	if($cms_page_id) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+function cms_display_content(&$tem /*, 'where clause %", %i', string, int */) {
+	$args = array_slice(func_get_args(), 1);
+	$args = array_merge(array('cms_pages', 'id,title,keywords,description,content'), $args);
+	$row = call_user_func_array('db_get_assoc', $args);
+	if($row) {
+		$tem->set('$cms_title', $row['title']);
+		$tem->set('$meta_keywords', $row['keywords']);
+		$tem->set('$meta_description', $row['description']);
+		$tem->set('$cms_body', $row['content']);
+		return $row['id'];
+	}
+	return false;
+}
diff --git a/inc/wfpl b/inc/wfpl
new file mode 160000
index 0000000..23dfbcc
--- /dev/null
+++ b/inc/wfpl
@@ -0,0 +1 @@
+Subproject commit 23dfbcc20fc6d20fb5be211e5af50cdcb8565c8e
diff --git a/run.php b/run.php
deleted file mode 100644
index 1d11c11..0000000
--- a/run.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require_once(__DIR__ . '/code/wfpl/run.php');
-- 
1.7.10.4