db_upgrade rework, admin_header, cleanup

[wfpl-cms.git] / config.php

diff --git a/config.php b/config.php
index 3e0f8fd..8a2bc85 100644 (file)
--- a/config.php
+++ b/config.php
@@ -10,8 +10,9 @@ define('WFPL_DB_PASS', 'fixme');
 date_default_timezone_set('America/New_York');
 
 # If you change these, update style.styl too
-define('WFPL_IMAGE_WIDTH_FULL',  900);
-define('WFPL_IMAGE_WIDTH_SMALL', 336); # this is "sidebar_width" in style.styl
+define('WFPL_SITE_WIDTH',        950); # "centerer_width" in style.styl
+define('WFPL_IMAGE_WIDTH_FULL',  WFPL_SITE_WIDTH);
+define('WFPL_IMAGE_WIDTH_SMALL', 250); # "sidebar_width" in style.styl
 define('WFPL_IMAGE_WIDTH_THUMB',  70);
 $GLOBALS['wfpl_image_widths'] = array(
        WFPL_IMAGE_WIDTH_FULL,
@@ -22,6 +23,7 @@ $GLOBALS['wfpl_image_widths'] = array(
 # Enable features, auto-includes
 require_once(__DIR__.'/'.'inc/wfpl/format.php');
 require_once(__DIR__.'/'.'inc/wfpl/db.php');
+require_once(__DIR__.'/'.'inc/wfpl/persistent.php');
 require_once(__DIR__.'/'.'inc/wfpl/session_messages.php');
 require_once(__DIR__.'/'.'inc/session_auth.php');
 require_once(__DIR__.'/'.'inc/cms.php');
@@ -30,18 +32,16 @@ require_once(__DIR__.'/'.'inc/misc.php');
 # Connect to the database
 db_connect(WFPL_DB, WFPL_DB_USER, WFPL_DB_PASS);
 
-# upgrade db (only) on special trigger (assures only one upgrade at a time)
-if (isset($_SERVER['HTTP_X_UPGRADE_DB_NOW'])) {
-       require_once(DOCROOT . 'inc/db_upgrade.php');
-       db_upgrade();
-}
+# Create tables, update schema, etc as necessary
+require_once(__DIR__.'/'.'inc/db_upgrade.php');
+db_upgrade();
 
 # paypal_ipn.php calls these when it receives a valid payment
 $GLOBALS['payment_handlers'] = [
        # the key (below) must be the first word in the paypal variable "custom"
        # the file will be run with wfpl's file_run()
        # example:
-       #'membership' => DOCROOT . 'inc/payment_membership.php'
+       #'membership' => __DIR__.'/'.'inc/payment_membership.php'
 ];
 
 $GLOBALS['email_templates'] = [