[mxbb-commits] core/includes/sessions/phpbb2 constants.php, 1.2, 1.3 session.php, 1.5, 1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/includes/sessions/phpbb2
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12672/includes/sessions/phpbb2

Modified Files:
	constants.php session.php 
Log Message:
No panic, only cosmetics, file headers and newlines etc... ;)

Index: constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/constants.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** constants.php	11 Feb 2008 12:08:59 -0000	1.2
--- constants.php	15 Jun 2008 09:15:43 -0000	1.3
***************
*** 1,23 ****
  <?php
! /***************************************************************************
!  *                               constants.php
!  *                            -------------------
!  *   begin                : Saturday', Feb 13', 2001
!  *   copyright            : ('C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
!  *
!  ***************************************************************************/
! 
! /***************************************************************************
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2 of the License', or
!  *   ('at your option) any later version.
!  *
!  ***************************************************************************/
  
  if ( !defined('IN_PHPBB') )
--- 1,12 ----
  <?php
! /**
! *
! * @package Style
! * @version $Id$
! * @copyright (c) 2002-2008 MX-Publisher Project Team
! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
! *
! */
  
  if ( !defined('IN_PHPBB') )
***************
*** 29,39 ****
  * Modifications:
  * define -> @define
! * to supress any notices since in mx_constants.php some are allready @defined 
  */
  
  // Debug Level
  //define('DEBUG', 1); // Debugging on
! @define('DEBUG', 1); // Debugging off
! 
  
  // User Levels <- Do not change the values of USER or ADMIN
--- 18,27 ----
  * Modifications:
  * define -> @define
! * to supress any notices since in mx_constants.php some are allready @defined
  */
  
  // Debug Level
  //define('DEBUG', 1); // Debugging on
! @define('DEBUG', 0); // Debugging off
  
  // User Levels <- Do not change the values of USER or ADMIN
***************
*** 45,49 ****
  @define('MOD', 2);
  
- 
  // User related
  @define('USER_ACTIVATION_NONE', 0);
--- 33,36 ----
***************
*** 56,60 ****
  @define('USER_AVATAR_GALLERY', 3);
  
- 
  // Group settings
  @define('GROUP_OPEN', 0);
--- 43,46 ----
***************
*** 62,71 ****
  @define('GROUP_HIDDEN', 2);
  
- 
  // Forum state
  @define('FORUM_UNLOCKED', 0);
  @define('FORUM_LOCKED', 1);
  
- 
  // Topic status
  @define('TOPIC_UNLOCKED', 0);
--- 48,55 ----
***************
*** 75,79 ****
  @define('TOPIC_WATCH_UN_NOTIFIED', 0);
  
- 
  // Topic types
  @define('POST_NORMAL', 0);
--- 59,62 ----
***************
*** 82,91 ****
  @define('POST_GLOBAL_ANNOUNCE', 3);
  
- 
  // SQL codes
  @define('BEGIN_TRANSACTION', 1);
  @define('END_TRANSACTION', 2);
  
- 
  // Error codes
  @define('GENERAL_MESSAGE', 200);
--- 65,72 ----
***************
*** 94,98 ****
  @define('CRITICAL_ERROR', 204);
  
- 
  // Private messaging
  @define('PRIVMSGS_READ_MAIL', 0);
--- 75,78 ----
***************
*** 103,107 ****
  @define('PRIVMSGS_UNREAD_MAIL', 5);
  
- 
  // URL PARAMETERS
  @define('POST_TOPIC_URL', 't');
--- 83,86 ----
***************
*** 116,120 ****
  @define('SESSION_METHOD_GET', 101);
  
- 
  // Page numbers for session handling
  @define('PAGE_INDEX', 0);
--- 95,98 ----
***************
*** 131,135 ****
  @define('PAGE_TOPIC_OFFSET', 5000);
  
- 
  // Auth settings
  @define('AUTH_LIST_ALL', 0);
--- 109,112 ----
***************
*** 153,157 ****
  @define('AUTH_ATTACH', 11);
  
- 
  // Table names
  @define('CONFIRM_TABLE', $table_prefix.'confirm');
--- 130,133 ----
***************
*** 186,189 ****
  @define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
  @define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
- 
  ?>
\ No newline at end of file
--- 162,164 ----

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** session.php	9 Feb 2008 19:42:38 -0000	1.5
--- session.php	15 Jun 2008 09:15:44 -0000	1.6
***************
*** 1,23 ****
  <?php
! /***************************************************************************
!  *                                sessions.php
!  *                            -------------------
!  *   begin                : Saturday, Feb 13, 2001
!  *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
!  *
!  ***************************************************************************/
! 
! /***************************************************************************
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2 of the License, or
!  *   (at your option) any later version.
!  *
!  ***************************************************************************/
  
  /**
--- 1,12 ----
  <?php
! /**
! *
! * @package Style
! * @version $Id$
! * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group
! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
! *
! */
  
  /**
***************
*** 250,263 ****
  			}
  
! 			if ( !$db->sql_query($sql) ) 
! 			{ 
! 				$sql2 = 'UPDATE ' . SESSIONS_KEYS_TABLE . " 
! 					SET last_login = $current_time 
! 					WHERE key_id = '" . md5($sessiondata['autologinid']) . "'"; 
! 				if ( !$db->sql_query($sql2) ) 
! 				{ 
! 					mx_message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); 
! 				} 
! 			} 
  			$sessiondata['autologinid'] = $auto_login_key;
  			unset($auto_login_key);
--- 239,252 ----
  			}
  
! 			if ( !$db->sql_query($sql) )
! 			{
! 				$sql2 = 'UPDATE ' . SESSIONS_KEYS_TABLE . "
! 					SET last_login = $current_time
! 					WHERE key_id = '" . md5($sessiondata['autologinid']) . "'";
! 				if ( !$db->sql_query($sql2) )
! 				{
! 					mx_message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql);
! 				}
! 			}
  			$sessiondata['autologinid'] = $auto_login_key;
  			unset($auto_login_key);