[geeklog-cvs] Geeklog-1.x/system lib-database.php,1.49,1.50

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv87511/system

Modified Files:
	lib-database.php 
Log Message:
Cosmetics


Index: lib-database.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-database.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** lib-database.php	11 Oct 2007 01:52:37 -0000	1.49
--- lib-database.php	3 Feb 2008 09:22:05 -0000	1.50
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-database.php                                                          |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-database.php                                                          |
***************
*** 9,13 ****
  // | Geeklog database library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
--- 9,13 ----
  // | Geeklog database library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
***************
*** 39,42 ****
--- 39,46 ----
  */
  
+ if (strpos ($_SERVER['PHP_SELF'], 'lib-database.php') !== false) {
+     die ('This file can not be used on its own!');
+ }
+ 
  // +---------------------------------------------------------------------------+
  // | Table definitions, these are used by the install program to create the    |
***************
*** 55,60 ****
  $_TABLES['cookiecodes']         = $_DB_table_prefix . 'cookiecodes';
  $_TABLES['dateformats']         = $_DB_table_prefix . 'dateformats';
- $_TABLES['events']              = $_DB_table_prefix . 'events';
- $_TABLES['eventsubmission']     = $_DB_table_prefix . 'eventsubmission';
  $_TABLES['featurecodes']        = $_DB_table_prefix . 'featurecodes';
  $_TABLES['features']            = $_DB_table_prefix . 'features';
--- 59,62 ----
***************
*** 62,76 ****
  $_TABLES['group_assignments']   = $_DB_table_prefix . 'group_assignments';
  $_TABLES['groups']              = $_DB_table_prefix . 'groups';
- $_TABLES['links']               = $_DB_table_prefix . 'links';
- $_TABLES['linksubmission']      = $_DB_table_prefix . 'linksubmission';
- $_TABLES['linkcategories']      = $_DB_table_prefix . 'linkcategories';
  $_TABLES['maillist']            = $_DB_table_prefix . 'maillist';
- $_TABLES['personal_events']     = $_DB_table_prefix . 'personal_events';
  $_TABLES['pingservice']         = $_DB_table_prefix . 'pingservice';
  $_TABLES['plugins']             = $_DB_table_prefix . 'plugins';
- $_TABLES['pollanswers']         = $_DB_table_prefix . 'pollanswers';
- $_TABLES['pollquestions']       = $_DB_table_prefix . 'pollquestions';
- $_TABLES['polltopics']          = $_DB_table_prefix . 'polltopics';
- $_TABLES['pollvoters']          = $_DB_table_prefix . 'pollvoters';
  $_TABLES['postmodes']           = $_DB_table_prefix . 'postmodes';
  $_TABLES['sessions']            = $_DB_table_prefix . 'sessions';
--- 64,70 ----
***************
*** 91,104 ****
  $_TABLES['vars']                = $_DB_table_prefix . 'vars';
  $_TABLES['conf_values']         = $_DB_table_prefix . 'conf_values';
- // the static pages plugin has become an integral part of Geeklog anyway ...
- $_TABLES['staticpage']          = $_DB_table_prefix . 'staticpage';
  
! // ditto for spamx
  $_TABLES['spamx']               = $_DB_table_prefix . 'spamx';
  
! // these tables aren't used by Geeklog any more, but the table names are needed
! // when upgrading from old versions
  $_TABLES['commentspeedlimit']   = $_DB_table_prefix . 'commentspeedlimit';
  $_TABLES['submitspeedlimit']    = $_DB_table_prefix . 'submitspeedlimit';
  $_TABLES['userevent']           = $_DB_table_prefix . 'userevent';
  
--- 85,120 ----
  $_TABLES['vars']                = $_DB_table_prefix . 'vars';
  $_TABLES['conf_values']         = $_DB_table_prefix . 'conf_values';
  
! 
! // Tables used by the bundled plugins
! 
! // Calendar plugin
! $_TABLES['events']              = $_DB_table_prefix . 'events';
! $_TABLES['eventsubmission']     = $_DB_table_prefix . 'eventsubmission';
! $_TABLES['personal_events']     = $_DB_table_prefix . 'personal_events';
! 
! // Links plugin
! $_TABLES['links']               = $_DB_table_prefix . 'links';
! $_TABLES['linkcategories']      = $_DB_table_prefix . 'linkcategories';
! $_TABLES['linksubmission']      = $_DB_table_prefix . 'linksubmission';
! 
! // Polls plugin
! $_TABLES['pollanswers']         = $_DB_table_prefix . 'pollanswers';
! $_TABLES['pollquestions']       = $_DB_table_prefix . 'pollquestions';
! $_TABLES['polltopics']          = $_DB_table_prefix . 'polltopics';
! $_TABLES['pollvoters']          = $_DB_table_prefix . 'pollvoters';
! 
! // Spam-X plugin
  $_TABLES['spamx']               = $_DB_table_prefix . 'spamx';
  
! // Static Pages plugin
! $_TABLES['staticpage']          = $_DB_table_prefix . 'staticpage';
! 
! 
! // These tables aren't used by Geeklog any more, but the table names are still
! // needed when upgrading from old versions
  $_TABLES['commentspeedlimit']   = $_DB_table_prefix . 'commentspeedlimit';
  $_TABLES['submitspeedlimit']    = $_DB_table_prefix . 'submitspeedlimit';
+ $_TABLES['tzcodes']             = $_DB_table_prefix . 'tzcodes';
  $_TABLES['userevent']           = $_DB_table_prefix . 'userevent';
  
***************
*** 108,120 ****
  // +---------------------------------------------------------------------------+
  
- if (strpos ($_SERVER['PHP_SELF'], 'lib-database.php') !== false) {
-     die ('This file can not be used on its own!');
- }
- 
  /**
  * Include appropriate DBMS object
  *
  */
! require_once($_CONF['path_system'] . 'databases/'. $_DB_dbms . '.class.php');
  
  // Instantiate the database object
--- 124,132 ----
  // +---------------------------------------------------------------------------+
  
  /**
  * Include appropriate DBMS object
  *
  */
! require_once $_CONF['path_system'] . 'databases/'. $_DB_dbms . '.class.php';
  
  // Instantiate the database object