All public pages now include lib.inc.php which checks for config.inc.php and errors...

diff --git a/all_db.php b/all_db.php
index a0e2992c1d4f19d49fd67a749a2092a47ec9e5cf..21374df8eceded114cd7b09ed412c0136c75a186 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -3,11 +3,11 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.5 2003/01/25 23:57:41 slubek Exp $
+        * $Id: all_db.php,v 1.6 2003/02/07 17:34:32 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/browser.php b/browser.php
index 36a524624c4221d1bcf5c499b843d7f50a464d70..989b3d451bb3e315958b500872c2a9bc17702a2b 100644 (file)
--- a/browser.php
+++ b/browser.php
@@ -5,11 +5,11 @@
         * if you click on a database it shows a list of database objects in that
         * database.
         *
-        * $Id: browser.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: browser.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        // Include tree classes
        include_once('classes/class.tree/class.tree.php');

diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist
index 0d4af1e6eefe774fdb0e59b4ac96d3e889db362e..422546feb952c3ec224e5690651083e1b332d70d 100644 (file)
--- a/conf/config.inc.php-dist
+++ b/conf/config.inc.php-dist
@@ -4,7 +4,7 @@
         * Central WebDB configuration.  As a user you may modify the
         * settings here for your particular configuration.
         *
-        * $Id: config.inc.php-dist,v 1.9 2003/01/18 09:07:51 chriskl Exp $
+        * $Id: config.inc.php-dist,v 1.10 2003/02/07 17:34:36 xzilla Exp $
         */
 
        // Set error reporting level
@@ -46,9 +46,6 @@
         * Don't modify anything below this line *
         *****************************************/
 
-       $appConfVersion = 2;
+       $appConfVersion = 3;
 
-       // Main library
-       include_once('libraries/lib.inc.php');
-       
 ?>

diff --git a/constraints.php b/constraints.php
index 01842158a4c4c6be9da71aea7ba424b2b1698df3..790faf919acfc9e47c86f948fbb57a00f2e285bd 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,11 +3,11 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: constraints.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        $PHP_SELF = $_SERVER['PHP_SELF'];

diff --git a/database.php b/database.php
index 06d185a49c321d1f60f1bffba1182c7dcaedffb1..3051e123a6ecd7e8518494cc1a8c375e98ced482 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,11 +3,11 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.2 2003/01/27 14:09:51 chriskl Exp $
+        * $Id: database.php,v 1.3 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/databases.php b/databases.php
index 9a4bc8d17e47f1fd6d41f95d24c41191b437c8d8..018499410bb643de6825dffc6e649193c63fa571 100755 (executable)
--- a/databases.php
+++ b/databases.php
@@ -4,11 +4,11 @@
         * List databases in a server
         * @param $webdbServerID The ID of the current server
         *
-        * $Id: databases.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: databases.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $misc->printHeader($strDatabases);
 ?>

diff --git a/display.php b/display.php
index 91b3cb6286b8f4a3e736fe30261ecfa6b7232eb6..df2e95600b6dcc793252ee88f2c92e2da8d01f56 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,11 +9,11 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.3 2003/01/27 15:18:03 chriskl Exp $
+        * $Id: display.php,v 1.4 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        global $strQueryResults, $guiMaxRows, $strRows;
 

diff --git a/functions.php b/functions.php
index 82ddfc83a57799de6ae436da6767d2acb43ee618..bb786de8bcaa0ddb980d24dd38c2492fb7ba0e7c 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,11 +3,11 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: functions.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/groups.php b/groups.php
index 59d1c7fd9bc7f0b6c4f58922dea8221218b7d939..9577eef5bd821917b9279e215e7c96914c01554d 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -3,11 +3,11 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.2 2003/02/01 14:11:53 xzilla Exp $
+        * $Id: groups.php,v 1.3 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/index.php b/index.php
index aebf6686731d1046b77688824862efbb5637dba7..7b6b3f46b4c6fd723d1c6fc65016a0ad902a064d 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -3,11 +3,11 @@
        /**
         * Main access point to the app.
         *
-        * $Id: index.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: index.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $misc->printHeader('', false);
 ?>

diff --git a/indexes.php b/indexes.php
index 4e3b49ca918650b9d4d825fa1a415bda4c2fe6c0..7da3c3525de9d4fe755f11e0f504048e51f80a84 100644 (file)
--- a/indexes.php
+++ b/indexes.php
@@ -3,11 +3,11 @@
        /**
         * List indexes on a table
         *
-        * $Id: indexes.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: indexes.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        $PHP_SELF = $_SERVER['PHP_SELF'];

diff --git a/intro.php b/intro.php
index 561c366e23ac825067a51f836fca22452565400c..4c43a9c6fadfd33df6ec2ed12b97342eed1533ec 100755 (executable)
--- a/intro.php
+++ b/intro.php
@@ -3,11 +3,11 @@
        /**
         * Intro screen
         *
-        * $Id: intro.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: intro.php,v 1.2 2003/02/07 17:34:34 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $misc->printHeader();
 ?>

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index ee7b19d1ce922096e6625f91cf14225ca9fe6441..d8c8ba3adffe711e0d79fed58d481d8ddab45970 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.14 2003/01/18 09:07:51 chriskl Exp $
+        * $Id: lib.inc.php,v 1.15 2003/02/07 17:34:37 xzilla Exp $
         */
 
        // Application name 
@@ -12,10 +12,22 @@
        // Application version
        $appVersion = '3.0-dev';
 
+
+       // Check to see if the configuration file exists, if not, explain
+       if (file_exists('conf/config.inc.php')) { 
+               include('conf/config.inc.php');
+       }
+       else 
+       {
+               echo "Configuration Error: You must rename/copy config.inc.php-dist to config.inc.php and set your appropriate settings"; 
+               exit;
+       }
+
+
        // Configuration file version.  If this is greater than that in config.inc.php, then
        // the app will refuse to run.  This and $appConfVersion should be incremented whenever
        // backwards incompatible changes are made to config.inc.php-dist.
-       $appBaseConfVersion = 2;
+       $appBaseConfVersion = 3;
 
        // List of available language files
        $appLangFiles = array(

diff --git a/login.php b/login.php
index 24cd1aaf6d69af1f17bd9f62a003f8d20d6e7227..6a4a54b56187829768ee3fef3fe45b21c089c59a 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -3,11 +3,11 @@
        /**
         * Login screen
         *
-        * $Id: login.php,v 1.2 2003/01/18 09:07:50 chriskl Exp $
+        * $Id: login.php,v 1.3 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include('conf/config.inc.php');
+       include('libraries/lib.inc.php');
        // Prepare form variables
        if (!isset($_POST['formServer'])) $_POST['formServer'] = '';
        if (!isset($_POST['formLanguage'])) $_POST['formLanguage'] = $appDefaultLanguage;

diff --git a/operators.php b/operators.php
index 0fd1cee098ea3c92571948605a940b36df0d89a6..af90df34af5d46ee99c3e5d614af474f9e01de0c 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -2,10 +2,10 @@
 /**
  *  FILENAME:   operators.php
  *
- *  $Id: operators.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+ *  $Id: operators.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
  */
 
-include_once( 'conf/config.inc.php' );
+include_once( 'libraries/lib.inc.php' );
 
 $action = ( isset( $_REQUEST['action'] ) ) ? $_REQUEST['action'] : '';
 

diff --git a/privileges.php b/privileges.php
index fb3acb1986930c3a68eda1b58e27e9c14ace98c8..a92bee94ba42476d937e00ea061723d43033840f 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -3,11 +3,11 @@
        /**
         * Manage views in a database
         *
-        * $Id: privileges.php,v 1.2 2003/01/26 00:00:27 slubek Exp $
+        * $Id: privileges.php,v 1.3 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/rules.php b/rules.php
index 7c7ad30926665d2279cf8c3bd9438a2b244dede6..b54a72a9dc0a63599890d73863873ef52bb9e9fa 100644 (file)
--- a/rules.php
+++ b/rules.php
@@ -3,11 +3,11 @@
        /**
         * List rules on a table
         *
-        * $Id: rules.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: rules.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        $PHP_SELF = $_SERVER['PHP_SELF'];

diff --git a/sequences.php b/sequences.php
index 317cb62f033dc4d15d859b5b6c34d5e94476ed9f..feeb87356f743afed17f9623cce78829974cf6c7 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -2,10 +2,10 @@
 /**
  *  FILENAME:   sequence.php
  *
- *  $Id: sequences.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+ *  $Id: sequences.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
  */
 
-include_once( 'conf/config.inc.php' );
+include_once( 'libraries/lib.inc.php' );
 
 $action = ( isset( $_REQUEST['action'] ) ) ? $_REQUEST['action'] : '';
 

diff --git a/tables.php b/tables.php
index a8d8a9aa0578a5bac0192b7deeca9762538dfa25..078b4011f01d76b1c291b86942aba45f0c1f26da 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,11 +3,11 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.4 2003/01/27 15:18:03 chriskl Exp $
+        * $Id: tables.php,v 1.5 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        $PHP_SELF = $_SERVER['PHP_SELF'];

diff --git a/tblexport.php b/tblexport.php
index 5a98d6160cd0e561efc54d36805af6089665d31e..ce0580bffee44989ceda5d31c93d93944cd55e46 100644 (file)
--- a/tblexport.php
+++ b/tblexport.php
@@ -3,7 +3,7 @@
        /**
         * Does an export to the screen or as a download
         *
-        * $Id: tblexport.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: tblexport.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        $extensions = array(
@@ -30,7 +30,7 @@
 
        // Include application functions
        $_no_output = true;
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        // Return all rows in the table
        // @@ Note: This should really use a cursor

diff --git a/tblproperties.php b/tblproperties.php
index 29b7b232396c4e22db115debd376f3f0b6314681..064197865f4fbf4ff9ac7f7365e05d50ff54f8c0 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,11 +3,11 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: tblproperties.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        $PHP_SELF = $_SERVER['PHP_SELF'];

diff --git a/topbar.php b/topbar.php
index 66f3950c59d54f6419256d9035fcbb3e9c03eb1e..764b7a332f6b746258447df2c8b761d008b56ae9 100755 (executable)
--- a/topbar.php
+++ b/topbar.php
@@ -3,11 +3,11 @@
        /**
         * Top menu for WebDB
         *
-        * $Id: topbar.php,v 1.2 2003/01/18 09:07:50 chriskl Exp $
+        * $Id: topbar.php,v 1.3 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $misc->printHeader();
 ?>

diff --git a/triggers.php b/triggers.php
index 4f13872a4975c3c9f819d07acdb72dd78e2cdffb..26afc8bec1238ef962318a02319051c2c2d3c856 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -3,11 +3,11 @@
        /**
         * List triggers on a table
         *
-        * $Id: triggers.php,v 1.1 2003/01/19 02:47:25 chriskl Exp $
+        * $Id: triggers.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        $PHP_SELF = $_SERVER['PHP_SELF'];

diff --git a/types.php b/types.php
index b7d1e357281222d836f07c5e434b8a19405a92d5..64724fb16a2ef13b3dba024cdb905e0309fb5e00 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,11 +3,11 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: types.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/users.php b/users.php
index 0ef5c64f82f880c2adfb6c83abbdd1a698e6f8bc..12cb1ae2e21dd33a639a3d57616fa48d9c51235b 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,11 +3,11 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: users.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';

diff --git a/views.php b/views.php
index 73658ec3ba555b9a0f5df5c3978a453e97d2927e..34a4cf8a5297f912d6079097803cfc93814eec86 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,11 +3,11 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.1 2003/01/18 06:38:36 chriskl Exp $
+        * $Id: views.php,v 1.2 2003/02/07 17:34:35 xzilla Exp $
         */
 
        // Include application functions
-       include_once('conf/config.inc.php');
+       include_once('libraries/lib.inc.php');
        
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';