X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.php;h=59b1c98a019ab3ea9fc56f3b0408861d5fe63336;hb=2078c2762990009d890fb6c36f0b0d947f559687;hp=a3698ae66059c2ccae747f9ac85a00a192b43f39;hpb=8c4eef93b5d12e5453780b2b23c6a06af5d3894f;p=wfpl-cms.git

diff --git a/config.php b/config.php
index a3698ae..59b1c98 100644
--- a/config.php
+++ b/config.php
@@ -1,21 +1,37 @@
 <?php
 
+# This file should be run automatically by wfpl_main.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
+# CMS login passwords are stored in the database. See admin_users.php
 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_IMAGE_WIDTH_THUMB',  70);
+$GLOBALS['wfpl_image_widths'] = array(
+	WFPL_IMAGE_WIDTH_FULL,
+	WFPL_IMAGE_WIDTH_SMALL,
+	WFPL_IMAGE_WIDTH_THUMB
+);
+
 # 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/session_auth.php');
+require_once(DOCROOT . 'inc/cms.php');
+require_once(DOCROOT . 'inc/misc.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(INC_WFPL . 'main.php');
-wfpl_main();
+# 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();
+}