[geeklog-cvs] geeklog-1.3/system lib-database.php,1.27,1.28 lib-plugins.php,1.25,1.26 lib-security.php,1.17,1.18 lib-sessions.php,1.24,1.25 lib-syndication.php,1.4,1.5

dhaun at geeklog.net dhaun at geeklog.net
Sun Dec 28 13:48:07 EST 2003


Update of /usr/cvs/geeklog/geeklog-1.3/system
In directory geeklog_prod:/tmp/cvs-serv1154

Modified Files:
	lib-database.php lib-plugins.php lib-security.php 
	lib-sessions.php lib-syndication.php 
Log Message:
A simple measure to prevent misuse in case of an incorrect installation.


Index: lib-database.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-database.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** lib-database.php	12 Aug 2003 21:10:06 -0000	1.27
--- lib-database.php	28 Dec 2003 18:48:05 -0000	1.28
***************
*** 6,13 ****
  // +---------------------------------------------------------------------------+
  // | lib-database.php                                                          |
- // | Geeklog database library.                                                 |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony at tonybibbs.com                                   |
--- 6,13 ----
  // +---------------------------------------------------------------------------+
  // | lib-database.php                                                          |
  // |                                                                           |
+ // | Geeklog database library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony at tonybibbs.com                                   |
***************
*** 32,44 ****
  
  /**
! * This is the common library for Geeklog.  Through our code, you will see functions
! * with the COM_ prefix (e.g. COM_siteHeader()).  Any such functions can be found in this
! * file.  This file provide all configuration variables needed by Geeklog with a
! * series of includes see futher down.  You only need to modify one line in this file.
! * WARNING: put any custom hacks in lib-custom.php and not in here.  This file is
! * modified frequently by the Geeklog development team.  If you put your hacks in
! * lib-custom.php you will find upgrading much easier. NOTE: as of Geeklog 1.3.5 you
! * should not have to edit this file
  *
  */
  
--- 32,39 ----
  
  /**
! * This is the high-level database layer for Geeklog (for the low-level stuff,
! * see the system/databases directory).
  *
+ * NOTE: As of Geeklog 1.3.5 you should not have to edit this file any more.
  */
  
***************
*** 104,107 ****
--- 99,106 ----
  // | DO NOT TOUCH ANYTHING BELOW HERE                                          |
  // +---------------------------------------------------------------------------+
+ 
+ if (eregi ('lib-database.php', $PHP_SELF)) {
+     die ('This file can not be used on its own.');
+ }
  
  /**

Index: lib-plugins.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** lib-plugins.php	1 Sep 2003 19:01:07 -0000	1.25
--- lib-plugins.php	28 Dec 2003 18:48:05 -0000	1.26
***************
*** 6,15 ****
  // +---------------------------------------------------------------------------+
  // | lib-plugins.php                                                           |
- // | This file implements plugin support in Geeklog.                           |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 6,16 ----
  // +---------------------------------------------------------------------------+
  // | lib-plugins.php                                                           |
  // |                                                                           |
+ // | This file implements plugin support in Geeklog.                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
+ // |          Dirk Haun        - dirk at haun-online.de
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 34,42 ****
  /**
  * This is the plugin library for Geeklog.  This is the API that plugins can
! * implement to get tight intergration with Geeklog.
  * See each function for more details.
  *
  */
  
  require_once($_CONF['path_system'] . 'classes/plugin.class.php');
  
--- 35,47 ----
  /**
  * This is the plugin library for Geeklog.  This is the API that plugins can
! * implement to get tight integration with Geeklog.
  * See each function for more details.
  *
  */
  
+ if (eregi ('lib-plugins.php', $PHP_SELF)) {
+     die ('This file can not be used on its own.');
+ }
+ 
  require_once($_CONF['path_system'] . 'classes/plugin.class.php');
  
***************
*** 779,785 ****
  
  /**
! * The user wants to save changes to his/her profile. Any plugin that added it's
  * own variables or blocks to the profile input form will now have to extract
! * it's data and save it.
  * Plugins will have to refer to the global $HTTP_POST_VARS array to get the
  * actual data.
--- 784,790 ----
  
  /**
! * The user wants to save changes to his/her profile. Any plugin that added its
  * own variables or blocks to the profile input form will now have to extract
! * its data and save it.
  * Plugins will have to refer to the global $HTTP_POST_VARS array to get the
  * actual data.

Index: lib-security.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-security.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lib-security.php	28 Sep 2003 13:20:04 -0000	1.17
--- lib-security.php	28 Dec 2003 18:48:05 -0000	1.18
***************
*** 6,11 ****
  // +---------------------------------------------------------------------------+
  // | lib-security.php                                                          |
- // | Geeklog security library.                                                 |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2003 by the following authors:                         |
--- 6,11 ----
  // +---------------------------------------------------------------------------+
  // | lib-security.php                                                          |
  // |                                                                           |
+ // | Geeklog security library.                                                 |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2003 by the following authors:                         |
***************
*** 62,65 ****
--- 62,69 ----
  // Turn this on go get various debug messages from the code in this library
  $_SEC_VERBOSE = false;
+ 
+ if (eregi ('lib-security.php', $PHP_SELF)) {
+     die ('This file can not be used on its own.');
+ }
  
  /**

Index: lib-sessions.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-sessions.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** lib-sessions.php	27 Sep 2003 16:47:40 -0000	1.24
--- lib-sessions.php	28 Dec 2003 18:48:05 -0000	1.25
***************
*** 42,45 ****
--- 42,49 ----
  $_SESS_VERBOSE = false;
  
+ if (eregi ('lib-sessions.php', $PHP_SELF)) {
+     die ('This file can not be used on its own.');
+ }
+ 
  if (empty ($_CONF['cookiedomain'])) {
      preg_match ("/\/\/([^\/:]*)/", $_CONF['site_url'], $server);

Index: lib-syndication.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-syndication.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lib-syndication.php	12 Sep 2003 11:51:03 -0000	1.4
--- lib-syndication.php	28 Dec 2003 18:48:05 -0000	1.5
***************
*** 35,38 ****
--- 35,42 ----
  $_SYND_DEBUG = false;
  
+ if (eregi ('lib-syndication.php', $PHP_SELF)) {
+     die ('This file can not be used on its own.');
+ }
+ 
  /**
  * Check if a feed for all stories needs to be updated.





More information about the geeklog-cvs mailing list