mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_bugsbt/bugsbt/admin admin_auth_manage.php, 1.6, 1.7 admin_cat_manage.php, 1.8, 1.9 admin_custom_manage.php, 1.5, 1.6 admin_settings.php, 1.7, 1.8 admin_types_manage.php, 1.5, 1.6

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv405

Modified Files:
	admin_auth_manage.php admin_cat_manage.php 
	admin_custom_manage.php admin_settings.php 
	admin_types_manage.php 
Log Message:
Moving load_file to mx_cache...

Index: admin_custom_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_custom_manage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_custom_manage.php	15 Jun 2008 21:03:34 -0000	1.5
--- admin_custom_manage.php	10 Jul 2008 22:21:39 -0000	1.6
***************
*** 24,29 ****
  		// Includes
  		//
! 		mx_page::load_file('functions_search', 'phpbb2');
! 		//include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
  		$this_custom_field = new mx_custom_field(BUGSBT_CUSTOM_TABLE, BUGSBT_CUSTOM_DATA_TABLE);
--- 24,28 ----
  		// Includes
  		//
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		$this_custom_field = new mx_custom_field(BUGSBT_CUSTOM_TABLE, BUGSBT_CUSTOM_DATA_TABLE);

Index: admin_cat_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_cat_manage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_cat_manage.php	15 Jun 2008 21:03:34 -0000	1.8
--- admin_cat_manage.php	10 Jul 2008 22:21:39 -0000	1.9
***************
*** 24,29 ****
  		// Includes
  		//
! 		mx_page::load_file('functions_search', 'phpbb2');
! 		//include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
  		$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, '');
--- 24,28 ----
  		// Includes
  		//
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, '');

Index: admin_types_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_types_manage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_types_manage.php	15 Jun 2008 21:03:34 -0000	1.5
--- admin_types_manage.php	10 Jul 2008 22:21:40 -0000	1.6
***************
*** 24,29 ****
  		// Includes
  		//
! 		mx_page::load_file('functions_search', 'phpbb2');
! 		//include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
  		//
--- 24,28 ----
  		// Includes
  		//
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		//

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_settings.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_settings.php	1 Jul 2008 21:48:06 -0000	1.7
--- admin_settings.php	10 Jul 2008 22:21:40 -0000	1.8
***************
*** 24,29 ****
  		// Includes
  		//
! 		mx_page::load_file('functions_search', 'phpbb2');
! 		//include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
  		//
--- 24,28 ----
  		// Includes
  		//
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		//

Index: admin_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_auth_manage.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_auth_manage.php	15 Jun 2008 21:03:34 -0000	1.6
--- admin_auth_manage.php	10 Jul 2008 22:21:39 -0000	1.7
***************
*** 24,29 ****
  		// Includes
  		//
! 		mx_page::load_file('functions_search', 'phpbb2');
! 		//include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
  		//
--- 24,28 ----
  		// Includes
  		//
! 		mx_cache::load_file('functions_search', 'phpbb2');
  
  		//

[mxbb-commits] mx_act/includes act_functions.php,1.10,1.11

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_act/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32767

Modified Files:
	act_functions.php 
Log Message:
Moving load_file to mx_cache...

Index: act_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_act/includes/act_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** act_functions.php	3 Jun 2008 20:06:58 -0000	1.10
--- act_functions.php	10 Jul 2008 22:21:12 -0000	1.11
***************
*** 91,100 ****
  	if( !function_exists('prepare_message') )
  	{
! 		mx_page::load_file('functions_post');
  	}
  
  	if( !function_exists('make_bbcode_uid') )
  	{
! 		mx_page::load_file('bbcode');
  	}
  
--- 91,100 ----
  	if( !function_exists('prepare_message') )
  	{
! 		mx_cache::load_file('functions_post');
  	}
  
  	if( !function_exists('make_bbcode_uid') )
  	{
! 		mx_cache::load_file('bbcode');
  	}
  

[mxbb-commits] core/modules/mx_coreblocks mx_search.php,1.27,1.28

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32361

Modified Files:
	mx_search.php 
Log Message:
Moving load_file to mx_cache...

Index: mx_search.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mx_search.php	17 Jun 2008 17:40:46 -0000	1.27
--- mx_search.php	10 Jul 2008 22:20:50 -0000	1.28
***************
*** 22,26 ****
  //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
! mx_page::load_file('functions_search', 'phpbb2');
  
  //
--- 22,26 ----
  //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
! mx_cache::load_file('functions_search', 'phpbb2');
  
  //

[mxbb-commits] core/includes mx_functions_core.php,1.91,1.92

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_core.php 
Log Message:
Moving load_file to mx_cache...

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** mx_functions_core.php	10 Jul 2008 22:04:52 -0000	1.91
--- mx_functions_core.php	10 Jul 2008 22:20:34 -0000	1.92
***************
*** 460,463 ****
--- 460,510 ----
  
  	/**
+ 	 * Load file.
+ 	 *
+ 	 * Load additional functions/classes.
+ 	 *
+ 	 * The $force_shared parameter will ensure we include the mxp shared version of the file.
+ 	 * If you need to include a shared version from a different backend, pass this info.
+ 	 *
+ 	 * Examples
+ 	 *
+ 	 * mx_cache::load_file('functions_post'), will include the phpbb version of the file
+ 	 * mx_cache::load_file('functions_post', true), will include the shared phpbb version of the file
+ 	 * mx_cache::load_file('functions_post', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode
+ 	 *
+ 	 * @param unknown_type $file
+ 	 * @param unknown_type $backend
+ 	 * @param unknown_type $force_shared
+ 	 */
+ 	function load_file($file = '', $force_shared = false)
+ 	{
+ 		global $mx_root_path, $phpbb_root_path, $phpEx;
+ 
+ 		if (PORTAL_BACKEND == 'internal' || $force_shared)
+ 		{
+ 			$backend = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND;
+ 			switch ($backend)
+ 			{
+ 				case 'internal':
+ 				case 'phpbb2':
+ 					$path = $mx_root_path . 'includes/shared/phpbb2/includes/';
+ 					break;
+ 				case 'phpbb3':
+ 					$path = $mx_root_path . 'includes/shared/phpbb3/includes/';
+ 					break;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$path = $phpbb_root_path . 'includes/';
+ 		}
+ 
+ 		if (file_exists($path . $file.'.'.$phpEx))
+ 		{
+ 			@include_once($path . $file.'.'.$phpEx);
+ 		}
+ 	}
+ 
+ 	/**
  	 * Enter description here...
  	 *
***************
*** 3649,3699 ****
  
  	/**
- 	 * Load file.
- 	 *
- 	 * Load additional functions/classes.
- 	 *
- 	 * The $force_shared parameter will ensure we include the mxp shared version of the file.
- 	 * If you need to include a shared version from a different backend, pass this info.
- 	 *
- 	 * Examples
- 	 *
- 	 * mx_page::load_file('functions_post'), will include the phpbb version of the file
- 	 * mx_page::load_file('functions_post', true), will include the shared phpbb version of the file
- 	 * mx_page::load_file('functions_post', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode
- 	 *
- 	 * @param unknown_type $file
- 	 * @param unknown_type $backend
- 	 * @param unknown_type $force_shared
- 	 */
- 	function load_file($file = '', $force_shared = false)
- 	{
- 		global $mx_root_path, $phpbb_root_path, $phpEx;
- 
- 		if (PORTAL_BACKEND == 'internal' || $force_shared)
- 		{
- 			$backend = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND;
- 			switch ($backend)
- 			{
- 				case 'internal':
- 				case 'phpbb2':
- 					$path = $mx_root_path . 'includes/shared/phpbb2/includes/';
- 					break;
- 				case 'phpbb3':
- 					$path = $mx_root_path . 'includes/shared/phpbb3/includes/';
- 					break;
- 			}
- 		}
- 		else
- 		{
- 			$path = $phpbb_root_path . 'includes/';
- 		}
- 
- 		if (file_exists($path . $file.'.'.$phpEx))
- 		{
- 			@include_once($path . $file.'.'.$phpEx);
- 		}
- 	}
- 
- 	/**
  	 * editcp_exists.
  	 *
--- 3696,3699 ----

[mxbb-commits] core/includes mx_functions_core.php,1.90,1.91

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_core.php 
Log Message:
Cleaning up...

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** mx_functions_core.php	9 Jul 2008 20:47:53 -0000	1.90
--- mx_functions_core.php	10 Jul 2008 22:04:52 -0000	1.91
***************
*** 262,265 ****
--- 262,270 ----
  			define('PORTAL_BACKEND', $portal_config['portal_backend']);
  		}
+ 
+ 		//
+ 		// Now, load backend specific constants
+ 		//
+ 		include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/constants.' . $phpEx);
  	}
  
***************
*** 325,328 ****
--- 330,460 ----
  		$server_url_phpbb = $server_protocol . $server_name . $server_port . $script_name_phpbb;
  		define('PHPBB_URL', $server_url_phpbb);
+ 
+ 		//
+ 		// Now sync Configs
+ 		// In phpBB mode, we rely on native phpBB configs, thus we need to sync mxp and phpbb settings
+ 		//
+ 		$this->sync_configs();
+ 	}
+ 
+ 	/**
+ 	 * Sync Configs
+ 	 * @access private
+ 	 */
+ 	function sync_configs()
+ 	{
+ 		global $portal_config, $board_config;
+ 
+ 		foreach ($portal_config as $key => $value)
+ 		{
+ 			$do = true;
+ 			switch ($key)
+ 			{
+ 				//
+ 				// Keep phpBB cookies/sessions
+ 				//
+ 				case 'cookie_domain':
+ 				case 'cookie_name':
+ 				case 'cookie_path':
+ 				case 'cookie_secure':
+ 				case 'session_length':
+ 				case 'allow_autologin':
+ 				case 'max_autologin_time':
+ 				case 'max_login_attempts':
+ 				case 'login_reset_time':
+ 
+ 					if (PORTAL_BACKEND != 'internal')
+ 					{
+ 						$do = false;
+ 					}
+ 					break;
+ 
+ 				//
+ 				// Keep phpBB stats
+ 				//
+ 				case 'record_online_users':
+ 				case 'record_online_date':
+ 
+ 					if (PORTAL_BACKEND != 'internal')
+ 					{
+ 						$do = false;
+ 					}
+ 					break;
+ 
+ 				//
+ 				// Keep portal settings
+ 				//
+ 				case 'default_style':
+ 				case 'override_user_style':
+ 				case 'default_lang':
+ 
+ 				//
+ 				// Keep portal settings
+ 				//
+ 				case 'allow_html':
+ 				case 'allow_html_tags':
+ 				case 'allow_bbcode':
+ 				case 'allow_smilies':
+ 				case 'smilies_path':
+ 
+ 				//
+ 				// Keep portal settings
+ 				//
+ 				case 'board_email':
+ 				case 'board_email_sig':
+ 				case 'smtp_delivery':
+ 				case 'smtp_host':
+ 				case 'smtp_username':
+ 				case 'smtp_password':
+ 				case 'smtp_auth_method':
+ 
+ 				//
+ 				// Keep portal settings
+ 				//
+ 				case 'default_dateformat':
+ 				case 'board_timezone':
+ 				case 'gzip_compress':
+ 
+ 				//
+ 				// Keep portal settings
+ 				//
+ 				case 'portal_id':
+ 				case 'portal_status':
+ 				case 'disabled_message':
+ 				case 'script_path':
+ 				case 'mx_use_cache':
+ 				case 'mod_rewrite':
+ 				case 'default_admin_style':
+ 				case 'overall_header':
+ 				case 'overall_footer':
+ 				case 'main_layout':
+ 				case 'navigation_block':
+ 				case 'top_phpbb_links':
+ 				case 'portal_version':
+ 				case 'portal_recached':
+ 				case 'portal_backend':
+ 				case 'portal_startdate':
+ 				case 'rand_seed':
+ 
+ 					break;
+ 
+ 				// Rename config keys and get internal sitename/sitedesc
+ 				//
+ 				case 'portal_name':
+ 
+ 					$key = 'sitename';
+ 					break;
+ 
+ 				case 'portal_desc':
+ 
+ 					$key = 'site_desc';
+ 					break;
+ 			}
+ 
+ 			if ($do)
+ 			{
+ 				$board_config[$key] = $value;
+ 			}
+ 		}
  	}
  
***************
*** 3235,3359 ****
  
  	/**
- 	 * Initiate and load page data
- 	 * @access private
- 	 */
- 	function sync_configs()
- 	{
- 		global $portal_config, $board_config;
- 
- 		foreach ($portal_config as $key => $value)
- 		{
- 			$do = true;
- 			switch ($key)
- 			{
- 				//
- 				// Keep phpBB cookies/sessions
- 				//
- 				case 'cookie_domain':
- 				case 'cookie_name':
- 				case 'cookie_path':
- 				case 'cookie_secure':
- 				case 'session_length':
- 				case 'allow_autologin':
- 				case 'max_autologin_time':
- 				case 'max_login_attempts':
- 				case 'login_reset_time':
- 
- 					if (PORTAL_BACKEND != 'internal')
- 					{
- 						$do = false;
- 					}
- 					break;
- 
- 				//
- 				// Keep phpBB stats
- 				//
- 				case 'record_online_users':
- 				case 'record_online_date':
- 
- 					if (PORTAL_BACKEND != 'internal')
- 					{
- 						$do = false;
- 					}
- 					break;
- 
- 				//
- 				// Keep portal settings
- 				//
- 				case 'default_style':
- 				case 'override_user_style':
- 				case 'default_lang':
- 
- 				//
- 				// Keep portal settings
- 				//
- 				case 'allow_html':
- 				case 'allow_html_tags':
- 				case 'allow_bbcode':
- 				case 'allow_smilies':
- 				case 'smilies_path':
- 
- 				//
- 				// Keep portal settings
- 				//
- 				case 'board_email':
- 				case 'board_email_sig':
- 				case 'smtp_delivery':
- 				case 'smtp_host':
- 				case 'smtp_username':
- 				case 'smtp_password':
- 				case 'smtp_auth_method':
- 
- 				//
- 				// Keep portal settings
- 				//
- 				case 'default_dateformat':
- 				case 'board_timezone':
- 				case 'gzip_compress':
- 
- 				//
- 				// Keep portal settings
- 				//
- 				case 'portal_id':
- 				case 'portal_status':
- 				case 'disabled_message':
- 				case 'script_path':
- 				case 'mx_use_cache':
- 				case 'mod_rewrite':
- 				case 'default_admin_style':
- 				case 'overall_header':
- 				case 'overall_footer':
- 				case 'main_layout':
- 				case 'navigation_block':
- 				case 'top_phpbb_links':
- 				case 'portal_version':
- 				case 'portal_recached':
- 				case 'portal_backend':
- 				case 'portal_startdate':
- 				case 'rand_seed':
- 
- 					break;
- 
- 				// Rename config keys and get internal sitename/sitedesc
- 				//
- 				case 'portal_name':
- 
- 					$key = 'sitename';
- 					break;
- 
- 				case 'portal_desc':
- 
- 					$key = 'site_desc';
- 					break;
- 			}
- 
- 			if ($do)
- 			{
- 				$board_config[$key] = $value;
- 			}
- 		}
- 	}
- 
- 	/**
  	 * Enter description here...
  	 *
--- 3367,3370 ----
***************
*** 3527,3544 ****
  		global $mx_block, $theme, $mx_user;
  
! 		switch (PORTAL_BACKEND)
! 		{
! 			case 'internal':
! 			case 'phpbb2':
! 				$style_path = $theme['template_name'];
! 				break;
! 			case 'phpbb3':
! 				$style_path = $theme['style_name'];
! 				break;
! 		}
! 
! 		if ( file_exists($mx_block->module_root_path . 'templates/' . $style_path.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']) ))
  		{
! 	 		$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/' . $style_path.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']);
  		}
  		else if ( file_exists($mx_block->module_root_path . 'templates/' . $mx_user->cloned_template_name.'/'.(!empty($filename) ? $filename : $mx_user->cloned_template_name)) )
--- 3538,3544 ----
  		global $mx_block, $theme, $mx_user;
  
! 		if ( file_exists($mx_block->module_root_path . 'templates/' . $mx_user->template_name.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']) ))
  		{
! 	 		$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/' . $mx_user->template_name.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']);
  		}
  		else if ( file_exists($mx_block->module_root_path . 'templates/' . $mx_user->cloned_template_name.'/'.(!empty($filename) ? $filename : $mx_user->cloned_template_name)) )

[mxbb-commits] core common.php,1.94,1.95

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23887

Modified Files:
	common.php 
Log Message:
Cleaning up...

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** common.php	9 Jul 2008 20:47:51 -0000	1.94
--- common.php	10 Jul 2008 22:04:51 -0000	1.95
***************
*** 221,225 ****
  // MX-Publisher Includes - doing the rest
  //
- include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/constants.' . $phpEx);
  include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions
  include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); // phpBB associated functions
--- 221,224 ----
***************
*** 263,271 ****
  
  //
- // In phpBB mode, we rely on native phpBB configs, thus we need to sync mxp and phpbb settings
- //
- mx_page::sync_configs();
- 
- //
  // Is phpBB File Attachment MOD present?
  //
--- 262,265 ----

[mxbb-commits] core/includes/sessions/phpbb2 login.php, 1.4, 1.5 session.php, 1.8, 1.9

[Jon O. <jon...@us...>]

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

Modified Files:
	login.php session.php 
Log Message:
Updated more generic initialization of styles and languages for backends.

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/login.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** login.php	9 Feb 2008 12:41:11 -0000	1.4
--- login.php	10 Jul 2008 20:46:36 -0000	1.5
***************
*** 58,62 ****
  
  				$admin = $mx_request_vars->is_post('admin');
! 				$session_id = $mx_user->mx_session_create($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
  
  				// Reset login tries
--- 58,62 ----
  
  				$admin = $mx_request_vars->is_post('admin');
! 				$session_id = $mx_user->session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
  
  				// Reset login tries
***************
*** 132,136 ****
  	if( $userdata['session_logged_in'] )
  	{
! 		$mx_user->mx_session_kill($userdata['session_id'], $userdata['user_id']);
  	}
  
--- 132,136 ----
  	if( $userdata['session_logged_in'] )
  	{
! 		$mx_user->session_end($userdata['session_id'], $userdata['user_id']);
  	}
  

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** session.php	9 Jul 2008 14:54:36 -0000	1.8
--- session.php	10 Jul 2008 20:46:36 -0000	1.9
***************
*** 23,26 ****
--- 23,29 ----
  class session
  {
+ 	//
+ 	// phpBB3 duplicates
+ 	//
  	var $cookie_data = array();
  	var $page = array();
***************
*** 35,38 ****
--- 38,63 ----
  	var $update_session_page = true;
  
+ 	var $lang = array();
+ 	var $help = array();
+ 	var $theme = array();
+ 	var $date_format;
+ 	var $timezone;
+ 	var $dst;
+ 
+ 	var $lang_name;
+ 	var $lang_path;
+ 	var $img_lang;
+ 	var $img_array = array();
+ 
+ 	/**
+ 	 * Load sessions
+ 	 * @access public
+ 	 *
+ 	 */
+ 	function load()
+ 	{
+ 		$this->data = $this->session_pagestart($this->user_ip, - ( MX_PORTAL_PAGES_OFFSET + $this->page_id ));
+ 	}
+ 
  	//
  	// Adds/updates a new session to the database for the given userid.
***************
*** 577,946 ****
  	}
  
  	/**
! 	* Setup basic user-specific items (style, language, ...)
  	*/
  	function setup($lang_set = false, $style = false)
  	{
  		global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache;
- 
  		global $mx_request_vars, $portal_config; //added for mxp
- 		
- 		//$template = new mx_Template($mx_root_path . 'templates/' . $this->template_name);
- 		
- 		switch (PORTAL_BACKEND)
- 		{
- 			case 'internal':
- 			case 'phpbb3':
- 				$phpbb_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/';
- 			break;
- 			case 'phpbb2':
- 				$phpbb_lang_path = $phpbb_root_path . 'language/';
- 			break;
- 			default:
- 				$phpbb_lang_path = $phpbb_root_path . 'language/';
- 		}
  
! 		$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
  
! 		if ($userdata['user_id'] != ANONYMOUS)
! 		{
! 			$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($userdata['user_lang']) : $board_config['default_lang'];
! 			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  
! 			$this->date_format = $this->data['user_dateformat'];
! 			$this->timezone = $this->data['user_timezone'] * 3600;
! 			$this->dst = $this->data['user_dst'] * 3600;
! 		}
! 		else
! 		{
! 			$this->lang_name = $board_config['default_lang'];
! 			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
! 			$this->date_format = $board_config['default_dateformat'];
! 			$this->timezone = $board_config['board_timezone'] * 3600;
! 			$this->dst = $board_config['board_dst'] * 3600;
! 		}
! 	
! 		// We include common language file here to not load it every time a custom language file is included
! 		//$this->lang = &$lang;
  
! 		$this->add_lang($lang_set);
! 		
  		// We include common language file here to not load it every time a custom language file is included
! 		//$lang = &$this->lang;		
! 		
! 		unset($lang_set);
! 
! 		/*
! 		if (!empty($_GET['style']) && $phpbb_auth->acl_get('a_styles'))
! 		{
! 			global $SID, $_EXTRA_URL;
! 
! 			$style = phpBB3::request_var('style', 0);
! 			$SID .= '&style=' . $style;
! 			$_EXTRA_URL = array('style=' . $style);
! 		}
! 		else
! 		{
! 			//Workaround by OryNider in this "else"
! 			$sql = "SELECT bbt.*
! 				FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt
! 				WHERE mxt.style_name = bbt.style_name
! 				AND mxt.portal_backend = '" . PORTAL_BACKEND . "'
! 				AND mxt.themes_id = " . (int) $this->style;
! 			if ( !($result = $db->sql_query($sql, 120)) )
! 			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 			$this->phpbb_style = $db->sql_fetchrow($result);
! 			$db->sql_freeresult($result);			
! 			
! 			// Set up style
! 			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
! 		}
! 
! 		$sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
! 			FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
! 			WHERE s.style_id = $style
! 				AND t.template_id = s.template_id
! 				AND c.theme_id = s.theme_id
! 				AND i.imageset_id = s.imageset_id";
! 		if ( !($result = $db->sql_query($sql, 3600)) )
! 		{
! 			mx_message_die(CRITICAL_ERROR, "Could not query database for imageset_id info style_id [$style]", "", __LINE__, __FILE__, $sql);
! 		}		
! 		
! 		$this->theme = $db->sql_fetchrow($result);
! 		$db->sql_freeresult($result);
! 
! 		// User has wrong style
! 		if (!$this->theme && $style == $this->data['user_style'])
! 		{
! 			$style = $this->data['user_style'] = $board_config['default_style'];
! 
! 			$sql = 'UPDATE ' . USERS_TABLE . "
! 				SET user_style = $style
! 				WHERE user_id = {$this->data['user_id']}";
! 			$db->sql_query($sql);
! 
! 			$sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
! 				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
! 				WHERE s.style_id = $style
! 					AND t.template_id = s.template_id
! 					AND c.theme_id = s.theme_id
! 					AND i.imageset_id = s.imageset_id";
! 			$result = $db->sql_query($sql, 3600);
! 			$this->theme = $db->sql_fetchrow($result);
! 			$db->sql_freeresult($result);
! 		}
! 
! 		if (!$this->theme)
! 		{
! 			trigger_error('Could not get style data', E_USER_ERROR);
! 		}
! 
! 		// Now parse the cfg file and cache it
! 		$parsed_items = $mx_cache->obtain_cfg_items($this->theme);
! 
! 		// We are only interested in the theme configuration for now
! 		$parsed_items = $parsed_items['theme'];
! 
! 		$check_for = array(
! 			'parse_css_file'	=> (int) 0,
! 			'pagination_sep'	=> (string) ', '
! 		);
! 
! 		foreach ($check_for as $key => $default_value)
! 		{
! 			$this->theme[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value;
! 			settype($this->theme[$key], gettype($default_value));
! 
! 			if (is_string($default_value))
! 			{
! 				$this->theme[$key] = htmlspecialchars($this->theme[$key]);
! 			}
! 		}
! 
! 		// If the style author specified the theme needs to be cached
! 		// (because of the used paths and variables) than make sure it is the case.
! 		// For example, if the theme uses language-specific images it needs to be stored in db.
! 		if (!$this->theme['theme_storedb'] && $this->theme['parse_css_file'])
! 		{
! 			$this->theme['theme_storedb'] = 1;
! 
! 			$stylesheet = file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/stylesheet.css");
! 			// Match CSS imports
! 			$matches = array();
! 			preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
! 
! 			if (sizeof($matches))
! 			{
! 				$content = '';
! 				foreach ($matches[0] as $idx => $match)
! 				{
! 					if ($content = @file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/" . $matches[1][$idx]))
! 					{
! 						$content = trim($content);
! 					}
! 					else
! 					{
! 						$content = '';
! 					}
! 					$stylesheet = str_replace($match, $content, $stylesheet);
! 				}
! 				unset($content);
! 			}
! 
! 			$stylesheet = str_replace('./', 'styles/' . $this->theme['theme_path'] . '/theme/', $stylesheet);
! 
! 			$sql_ary = array(
! 				'theme_data'	=> $stylesheet,
! 				'theme_mtime'	=> time(),
! 				'theme_storedb'	=> 1
! 			);
! 
! 			$sql = 'UPDATE ' . STYLES_THEME_TABLE . '
! 				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
! 				WHERE theme_id = ' . $this->theme['theme_id'];
! 			$db->sql_query($sql);
! 
! 			unset($sql_ary);
! 		}
! 
! 		$template->set_template();
! 
! 		$this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $board_config['default_lang'];
! 
! 		$sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width
! 			FROM ' . STYLES_IMAGESET_DATA_TABLE . '
! 			WHERE imageset_id = ' . $this->theme['imageset_id'] . "
! 			AND image_lang IN('" . $db->sql_escape($this->img_lang) . "', '')";
! 		$result = $db->sql_query($sql, 3600);
! 
! 		$localised_images = false;
! 		while ($row = $db->sql_fetchrow($result))
! 		{
! 			if ($row['image_lang'])
! 			{
! 				$localised_images = true;
! 			}
! 
! 			$this->img_array[$row['image_name']] = $row;
! 		}
! 		$db->sql_freeresult($result);
! 
! 		// there were no localised images, try to refresh the localised imageset for the user's language
! 		if (!$localised_images)
! 		{
! 			// Attention: this code ignores the image definition list from acp_styles and just takes everything
! 			// that the config file contains
! 			$sql_ary = array();
! 
! 			$db->sql_transaction('begin');
! 
! 			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
! 				WHERE imageset_id = ' . $this->theme['imageset_id'] . '
! 					AND image_lang = \'' . $db->sql_escape($this->img_lang) . '\'';
! 			$result = $db->sql_query($sql);
! 
! 			if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
! 			{
! 				$cfg_data_imageset_data = phpBB3::parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg");
! 				foreach ($cfg_data_imageset_data as $image_name => $value)
! 				{
! 					if (strpos($value, '*') !== false)
! 					{
! 						if (substr($value, -1, 1) === '*')
! 						{
! 							list($image_filename, $image_height) = explode('*', $value);
! 							$image_width = 0;
! 						}
! 						else
! 						{
! 							list($image_filename, $image_height, $image_width) = explode('*', $value);
! 						}
! 					}
! 					else
! 					{
! 						$image_filename = $value;
! 						$image_height = $image_width = 0;
! 					}
! 
! 					if (strpos($image_name, 'img_') === 0 && $image_filename)
! 					{
! 						$image_name = substr($image_name, 4);
! 						$sql_ary[] = array(
! 							'image_name'		=> (string) $image_name,
! 							'image_filename'	=> (string) $image_filename,
! 							'image_height'		=> (int) $image_height,
! 							'image_width'		=> (int) $image_width,
! 							'imageset_id'		=> (int) $this->theme['imageset_id'],
! 							'image_lang'		=> (string) $this->img_lang,
! 						);
! 					}
! 				}
! 			}
! 
! 			if (sizeof($sql_ary))
! 			{
! 				$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
! 				$db->sql_transaction('commit');
! 				$mx_cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
! 
! 				mx_add_log('admin', 'LOG_IMAGESET_LANG_REFRESHED', $this->theme['imageset_name'], $this->img_lang);
! 			}
! 			else
! 			{
! 				$db->sql_transaction('commit');
! 				mx_add_log('admin', 'LOG_IMAGESET_LANG_MISSING', $this->theme['imageset_name'], $this->img_lang);
! 			}
! 		}
! 
! 		// If this function got called from the error handler we are finished here.
! 		if (defined('IN_ERROR_HANDLER'))
! 		{
! 			return;
! 		}
  
! 		// Disable board if the install/ directory is still present
! 		// For the brave development army we do not care about this, else we need to comment out this everytime we develop locally
! 		if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install'))
  		{
! 			// Adjust the message slightly according to the permissions
! 			if ($phpbb_auth->acl_gets('a_', 'm_') || $phpbb_auth->acl_getf_global('m_'))
! 			{
! 				$message = 'REMOVE_INSTALL';
! 			}
! 			else
  			{
! 				$message = (!empty($board_config['board_disable_msg'])) ? $board_config['board_disable_msg'] : 'BOARD_DISABLE';
  			}
- 			trigger_error($message);
  		}
  
! 		// Is board disabled and user not an admin or moderator?
! 		if ($board_config['board_disable'] && !defined('IN_LOGIN') && !$phpbb_auth->acl_gets('a_', 'm_') && !$phpbb_auth->acl_getf_global('m_'))
! 		{
! 			header('HTTP/1.1 503 Service Unavailable');
! 
! 			$message = (!empty($board_config['board_disable_msg'])) ? $board_config['board_disable_msg'] : 'BOARD_DISABLE';
! 			trigger_error($message);
! 		}
! 
! 		// Is load exceeded?
! 		if ($board_config['limit_load'] && $this->load !== false)
! 		{
! 			if ($this->load > floatval($board_config['limit_load']) && !defined('IN_LOGIN'))
! 			{
! 				// Set board disabled to true to let the admins/mods get the proper notification
! 				$board_config['board_disable'] = '1';
! 
! 				if (!$phpbb_auth->acl_gets('a_', 'm_') && !$phpbb_auth->acl_getf_global('m_'))
! 				{
! 					header('HTTP/1.1 503 Service Unavailable');
! 					trigger_error('BOARD_UNAVAILABLE');
! 				}
! 			}
! 		}
  
! 		if (isset($this->data['session_viewonline']))
! 		{
! 			// Make sure the user is able to hide his session
! 			if (!$this->data['session_viewonline'])
! 			{
! 				// Reset online status if not allowed to hide the session...
! 				if (!$phpbb_auth->acl_get('u_hideonline'))
! 				{
! 					$sql = 'UPDATE ' . SESSIONS_TABLE . '
! 						SET session_viewonline = 1
! 						WHERE session_user_id = ' . $this->data['user_id'];
! 					$db->sql_query($sql);
! 					$this->data['session_viewonline'] = 1;
! 				}
! 			}
! 			else if (!$this->data['user_allow_viewonline'])
! 			{
! 				// the user wants to hide and is allowed to  -> cloaking device on.
! 				if ($phpbb_auth->acl_get('u_hideonline'))
! 				{
! 					$sql = 'UPDATE ' . SESSIONS_TABLE . '
! 						SET session_viewonline = 0
! 						WHERE session_user_id = ' . $this->data['user_id'];
! 					$db->sql_query($sql);
! 					$this->data['session_viewonline'] = 0;
! 				}
! 			}
! 		}
  
  
! 		// Does the user need to change their password? If so, redirect to the
! 		// ucp profile reg_details page ... of course do not redirect if we're already in the ucp
! 		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $board_config['chg_passforce'] && $this->data['is_registered'] && $phpbb_auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($board_config['chg_passforce'] * 86400))
! 		{
! 			if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
! 			{
! 				mx_redirect(mx_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=reg_details'));
! 			}
! 		}
! 		*/
  		return;
  	}
--- 602,661 ----
  	}
  
+ 	/** *******************************************************************************************************
+ 	 * Include the User class
+ 	 ******************************************************************************************************* */
+ 
  	/**
! 	* Define backend specific lang defs
  	*/
  	function setup($lang_set = false, $style = false)
  	{
  		global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache;
  		global $mx_request_vars, $portal_config; //added for mxp
  
! 		$lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'lang_admin' : 'lang_main') : $lang_set;
  
! 		$this->lang_name = $this->lang['default_lang'];
! 		$this->lang_path = $shared_lang_path;
  
! 		$this->date_format = $board_config['default_dateformat'];
! 		$this->timezone = $board_config['user_timezone'] * 3600;
! 		$this->dst = $this->data['user_dst'] * 3600;
  
! 		//
  		// We include common language file here to not load it every time a custom language file is included
! 		//
! 		$lang = &$this->lang;
  
! 		/* Sort of pointless here, since we have already included all main lang files
! 		if ((@include $this->lang_path . "common.$phpEx") === false)
  		{
! 			//this will fix the path for anonymouse users
! 			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
  			}
  		}
+ 		*/
  
! 		// We include common language file here to not load it every time a custom language file is included
! 		//$this->lang = &$lang;
! 		$this->add_lang($lang_set);
  
! 		// We include common language file here to not load it every time a custom language file is included
! 		//$lang = &$this->lang;
! 		unset($lang_set);
  
+ 		return;
+ 	}
  
! 	/**
! 	 * Setup style
! 	 *
! 	 * Define backend specific style defs
! 	 *
! 	 */
! 	function setup_style()
! 	{
  		return;
  	}
***************
*** 995,999 ****
  		elseif ($lang_set)
  		{
! 			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);			
  		}
  	}
--- 710,714 ----
  		elseif ($lang_set)
  		{
! 			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
  		}
  	}
***************
*** 1005,1042 ****
  	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
  	{
! 		global $phpbb_root_path, $phpEx; 
! 			
! 
! 		// Make sure the language path is set (if the user setup did not happen it is not set)
! 		if (!$this->lang_path)
! 		{
! 			global $mx_root_path, $board_config, $userdata;
! 
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb3':
! 					$phpbb_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/';
! 				break;
! 				case 'phpbb2':
! 					$phpbb_lang_path = $phpbb_root_path . 'language/';
! 				break;
! 				default:
! 					$phpbb_lang_path = $phpbb_root_path . 'language/';
! 			}
! 
! 			$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
! 
! 			if ($userdata['user_id'] != ANONYMOUS)
! 			{
! 				$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($userdata['user_lang']) : $board_config['default_lang'];
! 				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
! 			}
! 			else
! 			{
! 				$this->lang_name = $board_config['default_lang'];
! 				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
! 			}
! 		}		
  
  		// $lang == $this->lang
--- 720,724 ----
  	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
  	{
! 		global $phpbb_root_path, $phpEx;
  
  		// $lang == $this->lang
***************
*** 1053,1057 ****
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
!  
  			//fix for mxp
  			if ((@include $language_filename) === false)
--- 735,739 ----
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
! 
  			//fix for mxp
  			if ((@include $language_filename) === false)
***************
*** 1071,1077 ****
  			die("You should not use db with MX-Publisher!");
  		}
! 		
  		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;		
  	}
  }
--- 753,785 ----
  			die("You should not use db with MX-Publisher!");
  		}
! 
  		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;
! 	}
! 
! 	/**
! 	 * encode_lang
! 	 *
! 	 * $default_lang = $mx_user->encode_lang($board_config['default_lang']);
! 	 *
! 	 * @param unknown_type $lang
! 	 * @return unknown
! 	 */
! 	function encode_lang($lang)
! 	{
! 		return $lang;
! 	}
! 
! 	/**
! 	 * decode_lang
! 	 *
! 	 * $default_lang = $mx_user->decode_lang($board_config['default_lang']);
! 	 *
! 	 * @param unknown_type $lang
! 	 * @return unknown
! 	 */
! 	function decode_lang($lang)
! 	{
! 		return $lang;
  	}
  }

[mxbb-commits] core/includes/sessions/internal login.php, 1.4, 1.5 session.php, 1.9, 1.10

[Jon O. <jon...@us...>]

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

Modified Files:
	login.php session.php 
Log Message:
Updated more generic initialization of styles and languages for backends.

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/login.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** login.php	9 Feb 2008 12:41:11 -0000	1.4
--- login.php	10 Jul 2008 20:46:36 -0000	1.5
***************
*** 58,62 ****
  
  				$admin = $mx_request_vars->is_post('admin');
! 				$session_id = $mx_user->mx_session_create($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
  
  				// Reset login tries
--- 58,62 ----
  
  				$admin = $mx_request_vars->is_post('admin');
! 				$session_id = $mx_user->session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
  
  				// Reset login tries
***************
*** 140,144 ****
  	if( $userdata['session_logged_in'] )
  	{
! 		$mx_user->mx_session_kill($userdata['session_id'], $userdata['user_id']);
  	}
  
--- 140,144 ----
  	if( $userdata['session_logged_in'] )
  	{
! 		$mx_user->session_end($userdata['session_id'], $userdata['user_id']);
  	}
  

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** session.php	10 Jul 2008 14:09:48 -0000	1.9
--- session.php	10 Jul 2008 20:46:36 -0000	1.10
***************
*** 36,39 ****
--- 36,64 ----
  
  	//
+ 	// phpBB3 duplicates
+ 	//
+ 	var $lang = array();
+ 	var $help = array();
+ 	var $theme = array();
+ 	var $date_format;
+ 	var $timezone;
+ 	var $dst;
+ 
+ 	var $lang_name;
+ 	var $lang_path;
+ 	var $img_lang;
+ 	var $img_array = array();
+ 
+ 	/**
+ 	 * Load sessions
+ 	 * @access public
+ 	 *
+ 	 */
+ 	function load()
+ 	{
+ 		$this->data = $this->session_pagestart($this->user_ip, - ( MX_PORTAL_PAGES_OFFSET + $this->page_id ));
+ 	}
+ 
+ 	//
  	// Adds/updates a new session to the database for the given userid.
  	// Returns the new session ID on success.
***************
*** 574,944 ****
  	}
  
  	/**
! 	* Setup basic user-specific items (style, language, ...)
  	*/
  	function setup($lang_set = false, $style = false)
  	{
  		global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache;
- 
  		global $mx_request_vars, $portal_config; //added for mxp
- 		
- 		//$template = new mx_Template($mx_root_path . 'templates/' . $this->template_name);
- 		
- 		switch (PORTAL_BACKEND)
- 		{
- 			case 'internal':
- 			case 'phpbb3':
- 				$phpbb_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/';
- 			break;
- 			case 'phpbb2':
- 				$phpbb_lang_path = $phpbb_root_path . 'language/';
- 			break;
- 			default:
- 				$phpbb_lang_path = $phpbb_root_path . 'language/';
- 		}
- 
- 		$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
  
! 		if ($userdata['user_id'] != ANONYMOUS)
! 		{
! 			$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($userdata['user_lang']) : $board_config['default_lang'];
! 			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  
! 			$this->date_format = $this->data['user_dateformat'];
! 			$this->timezone = $this->data['user_timezone'] * 3600;
! 			$this->dst = $this->data['user_dst'] * 3600;
! 		}
! 		else
! 		{
! 			$this->lang_name = $board_config['default_lang'];
! 			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
! 			$this->date_format = $board_config['default_dateformat'];
! 			$this->timezone = $board_config['board_timezone'] * 3600;
! 			$this->dst = $board_config['board_dst'] * 3600;
! 		}
  
! 		
! 		// We include common language file here to not load it every time a custom language file is included
! 		//$this->lang = &$lang;
  
! 		$this->add_lang($lang_set);
! 		
  		// We include common language file here to not load it every time a custom language file is included
! 		//$lang = &$this->lang;		
! 		
! 		unset($lang_set);
! 
! 		/*
! 		if (!empty($_GET['style']) && $phpbb_auth->acl_get('a_styles'))
! 		{
! 			global $SID, $_EXTRA_URL;
! 
! 			$style = phpBB3::request_var('style', 0);
! 			$SID .= '&style=' . $style;
! 			$_EXTRA_URL = array('style=' . $style);
! 		}
! 		else
! 		{
! 			//Workaround by OryNider in this "else"
! 			$sql = "SELECT bbt.*
! 				FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt
! 				WHERE mxt.style_name = bbt.style_name
! 				AND mxt.portal_backend = '" . PORTAL_BACKEND . "'
! 				AND mxt.themes_id = " . (int) $this->style;
! 			if ( !($result = $db->sql_query($sql, 120)) )
! 			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 			$this->phpbb_style = $db->sql_fetchrow($result);
! 			$db->sql_freeresult($result);			
! 			
! 			// Set up style
! 			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
! 		}
! 
! 		$sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
! 			FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
! 			WHERE s.style_id = $style
! 				AND t.template_id = s.template_id
! 				AND c.theme_id = s.theme_id
! 				AND i.imageset_id = s.imageset_id";
! 		if ( !($result = $db->sql_query($sql, 3600)) )
! 		{
! 			mx_message_die(CRITICAL_ERROR, "Could not query database for imageset_id info style_id [$style]", "", __LINE__, __FILE__, $sql);
! 		}		
! 		
! 		$this->theme = $db->sql_fetchrow($result);
! 		$db->sql_freeresult($result);
! 
! 		// User has wrong style
! 		if (!$this->theme && $style == $this->data['user_style'])
! 		{
! 			$style = $this->data['user_style'] = $board_config['default_style'];
! 
! 			$sql = 'UPDATE ' . USERS_TABLE . "
! 				SET user_style = $style
! 				WHERE user_id = {$this->data['user_id']}";
! 			$db->sql_query($sql);
! 
! 			$sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
! 				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
! 				WHERE s.style_id = $style
! 					AND t.template_id = s.template_id
! 					AND c.theme_id = s.theme_id
! 					AND i.imageset_id = s.imageset_id";
! 			$result = $db->sql_query($sql, 3600);
! 			$this->theme = $db->sql_fetchrow($result);
! 			$db->sql_freeresult($result);
! 		}
! 
! 		if (!$this->theme)
! 		{
! 			trigger_error('Could not get style data', E_USER_ERROR);
! 		}
! 
! 		// Now parse the cfg file and cache it
! 		$parsed_items = $mx_cache->obtain_cfg_items($this->theme);
! 
! 		// We are only interested in the theme configuration for now
! 		$parsed_items = $parsed_items['theme'];
! 
! 		$check_for = array(
! 			'parse_css_file'	=> (int) 0,
! 			'pagination_sep'	=> (string) ', '
! 		);
! 
! 		foreach ($check_for as $key => $default_value)
! 		{
! 			$this->theme[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value;
! 			settype($this->theme[$key], gettype($default_value));
! 
! 			if (is_string($default_value))
! 			{
! 				$this->theme[$key] = htmlspecialchars($this->theme[$key]);
! 			}
! 		}
! 
! 		// If the style author specified the theme needs to be cached
! 		// (because of the used paths and variables) than make sure it is the case.
! 		// For example, if the theme uses language-specific images it needs to be stored in db.
! 		if (!$this->theme['theme_storedb'] && $this->theme['parse_css_file'])
! 		{
! 			$this->theme['theme_storedb'] = 1;
! 
! 			$stylesheet = file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/stylesheet.css");
! 			// Match CSS imports
! 			$matches = array();
! 			preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
! 
! 			if (sizeof($matches))
! 			{
! 				$content = '';
! 				foreach ($matches[0] as $idx => $match)
! 				{
! 					if ($content = @file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/" . $matches[1][$idx]))
! 					{
! 						$content = trim($content);
! 					}
! 					else
! 					{
! 						$content = '';
! 					}
! 					$stylesheet = str_replace($match, $content, $stylesheet);
! 				}
! 				unset($content);
! 			}
! 
! 			$stylesheet = str_replace('./', 'styles/' . $this->theme['theme_path'] . '/theme/', $stylesheet);
! 
! 			$sql_ary = array(
! 				'theme_data'	=> $stylesheet,
! 				'theme_mtime'	=> time(),
! 				'theme_storedb'	=> 1
! 			);
! 
! 			$sql = 'UPDATE ' . STYLES_THEME_TABLE . '
! 				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
! 				WHERE theme_id = ' . $this->theme['theme_id'];
! 			$db->sql_query($sql);
! 
! 			unset($sql_ary);
! 		}
! 
! 		$template->set_template();
! 
! 		$this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $board_config['default_lang'];
! 
! 		$sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width
! 			FROM ' . STYLES_IMAGESET_DATA_TABLE . '
! 			WHERE imageset_id = ' . $this->theme['imageset_id'] . "
! 			AND image_lang IN('" . $db->sql_escape($this->img_lang) . "', '')";
! 		$result = $db->sql_query($sql, 3600);
! 
! 		$localised_images = false;
! 		while ($row = $db->sql_fetchrow($result))
! 		{
! 			if ($row['image_lang'])
! 			{
! 				$localised_images = true;
! 			}
! 
! 			$this->img_array[$row['image_name']] = $row;
! 		}
! 		$db->sql_freeresult($result);
! 
! 		// there were no localised images, try to refresh the localised imageset for the user's language
! 		if (!$localised_images)
! 		{
! 			// Attention: this code ignores the image definition list from acp_styles and just takes everything
! 			// that the config file contains
! 			$sql_ary = array();
! 
! 			$db->sql_transaction('begin');
! 
! 			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
! 				WHERE imageset_id = ' . $this->theme['imageset_id'] . '
! 					AND image_lang = \'' . $db->sql_escape($this->img_lang) . '\'';
! 			$result = $db->sql_query($sql);
! 
! 			if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
! 			{
! 				$cfg_data_imageset_data = phpBB3::parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg");
! 				foreach ($cfg_data_imageset_data as $image_name => $value)
! 				{
! 					if (strpos($value, '*') !== false)
! 					{
! 						if (substr($value, -1, 1) === '*')
! 						{
! 							list($image_filename, $image_height) = explode('*', $value);
! 							$image_width = 0;
! 						}
! 						else
! 						{
! 							list($image_filename, $image_height, $image_width) = explode('*', $value);
! 						}
! 					}
! 					else
! 					{
! 						$image_filename = $value;
! 						$image_height = $image_width = 0;
! 					}
! 
! 					if (strpos($image_name, 'img_') === 0 && $image_filename)
! 					{
! 						$image_name = substr($image_name, 4);
! 						$sql_ary[] = array(
! 							'image_name'		=> (string) $image_name,
! 							'image_filename'	=> (string) $image_filename,
! 							'image_height'		=> (int) $image_height,
! 							'image_width'		=> (int) $image_width,
! 							'imageset_id'		=> (int) $this->theme['imageset_id'],
! 							'image_lang'		=> (string) $this->img_lang,
! 						);
! 					}
! 				}
! 			}
! 
! 			if (sizeof($sql_ary))
! 			{
! 				$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
! 				$db->sql_transaction('commit');
! 				$mx_cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
! 
! 				mx_add_log('admin', 'LOG_IMAGESET_LANG_REFRESHED', $this->theme['imageset_name'], $this->img_lang);
! 			}
! 			else
! 			{
! 				$db->sql_transaction('commit');
! 				mx_add_log('admin', 'LOG_IMAGESET_LANG_MISSING', $this->theme['imageset_name'], $this->img_lang);
! 			}
! 		}
! 
! 		// If this function got called from the error handler we are finished here.
! 		if (defined('IN_ERROR_HANDLER'))
! 		{
! 			return;
! 		}
  
! 		// Disable board if the install/ directory is still present
! 		// For the brave development army we do not care about this, else we need to comment out this everytime we develop locally
! 		if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install'))
  		{
! 			// Adjust the message slightly according to the permissions
! 			if ($phpbb_auth->acl_gets('a_', 'm_') || $phpbb_auth->acl_getf_global('m_'))
! 			{
! 				$message = 'REMOVE_INSTALL';
! 			}
! 			else
  			{
! 				$message = (!empty($board_config['board_disable_msg'])) ? $board_config['board_disable_msg'] : 'BOARD_DISABLE';
  			}
- 			trigger_error($message);
  		}
  
! 		// Is board disabled and user not an admin or moderator?
! 		if ($board_config['board_disable'] && !defined('IN_LOGIN') && !$phpbb_auth->acl_gets('a_', 'm_') && !$phpbb_auth->acl_getf_global('m_'))
! 		{
! 			header('HTTP/1.1 503 Service Unavailable');
! 
! 			$message = (!empty($board_config['board_disable_msg'])) ? $board_config['board_disable_msg'] : 'BOARD_DISABLE';
! 			trigger_error($message);
! 		}
! 
! 		// Is load exceeded?
! 		if ($board_config['limit_load'] && $this->load !== false)
! 		{
! 			if ($this->load > floatval($board_config['limit_load']) && !defined('IN_LOGIN'))
! 			{
! 				// Set board disabled to true to let the admins/mods get the proper notification
! 				$board_config['board_disable'] = '1';
! 
! 				if (!$phpbb_auth->acl_gets('a_', 'm_') && !$phpbb_auth->acl_getf_global('m_'))
! 				{
! 					header('HTTP/1.1 503 Service Unavailable');
! 					trigger_error('BOARD_UNAVAILABLE');
! 				}
! 			}
! 		}
  
! 		if (isset($this->data['session_viewonline']))
! 		{
! 			// Make sure the user is able to hide his session
! 			if (!$this->data['session_viewonline'])
! 			{
! 				// Reset online status if not allowed to hide the session...
! 				if (!$phpbb_auth->acl_get('u_hideonline'))
! 				{
! 					$sql = 'UPDATE ' . SESSIONS_TABLE . '
! 						SET session_viewonline = 1
! 						WHERE session_user_id = ' . $this->data['user_id'];
! 					$db->sql_query($sql);
! 					$this->data['session_viewonline'] = 1;
! 				}
! 			}
! 			else if (!$this->data['user_allow_viewonline'])
! 			{
! 				// the user wants to hide and is allowed to  -> cloaking device on.
! 				if ($phpbb_auth->acl_get('u_hideonline'))
! 				{
! 					$sql = 'UPDATE ' . SESSIONS_TABLE . '
! 						SET session_viewonline = 0
! 						WHERE session_user_id = ' . $this->data['user_id'];
! 					$db->sql_query($sql);
! 					$this->data['session_viewonline'] = 0;
! 				}
! 			}
! 		}
  
  
! 		// Does the user need to change their password? If so, redirect to the
! 		// ucp profile reg_details page ... of course do not redirect if we're already in the ucp
! 		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $board_config['chg_passforce'] && $this->data['is_registered'] && $phpbb_auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($board_config['chg_passforce'] * 86400))
! 		{
! 			if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
! 			{
! 				mx_redirect(mx_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=reg_details'));
! 			}
! 		}
! 		*/
  		return;
  	}
--- 599,658 ----
  	}
  
+ 	/** *******************************************************************************************************
+ 	 * Include the User class
+ 	 ******************************************************************************************************* */
+ 
  	/**
! 	* Define backend specific lang defs
  	*/
  	function setup($lang_set = false, $style = false)
  	{
  		global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache;
  		global $mx_request_vars, $portal_config; //added for mxp
  
! 		$lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'lang_admin' : 'lang_main') : $lang_set;
  
! 		$this->lang_name = $this->lang['default_lang'];
! 		$this->lang_path = $shared_lang_path;
  
! 		$this->date_format = $board_config['default_dateformat'];
! 		$this->timezone = $board_config['user_timezone'] * 3600;
! 		$this->dst = $this->data['user_dst'] * 3600;
  
! 		//
  		// We include common language file here to not load it every time a custom language file is included
! 		//
! 		$lang = &$this->lang;
  
! 		/* Sort of pointless here, since we have already included all main lang files
! 		if ((@include $this->lang_path . "common.$phpEx") === false)
  		{
! 			//this will fix the path for anonymouse users
! 			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
  			}
  		}
+ 		*/
  
! 		// We include common language file here to not load it every time a custom language file is included
! 		//$this->lang = &$lang;
! 		$this->add_lang($lang_set);
  
! 		// We include common language file here to not load it every time a custom language file is included
! 		//$lang = &$this->lang;
! 		unset($lang_set);
  
+ 		return;
+ 	}
  
! 	/**
! 	 * Setup style
! 	 *
! 	 * Define backend specific style defs
! 	 *
! 	 */
! 	function setup_style()
! 	{
  		return;
  	}
***************
*** 993,997 ****
  		elseif ($lang_set)
  		{
! 			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);			
  		}
  	}
--- 707,711 ----
  		elseif ($lang_set)
  		{
! 			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
  		}
  	}
***************
*** 1003,1040 ****
  	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
  	{
! 		global $phpbb_root_path, $phpEx; 
! 			
! 
! 		// Make sure the language path is set (if the user setup did not happen it is not set)
! 		if (!$this->lang_path)
! 		{
! 			global $mx_root_path, $board_config;
! 
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb3':
! 					$phpbb_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/';
! 				break;
! 				case 'phpbb2':
! 					$phpbb_lang_path = $phpbb_root_path . 'language/';
! 				break;
! 				default:
! 					$phpbb_lang_path = $phpbb_root_path . 'language/';
! 			}
! 
! 			$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
! 
! 			if ($this->data['user_id'] != ANONYMOUS)
! 			{
! 				$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($this->data['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($this->data['user_lang']) : $board_config['default_lang'];
! 				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
! 			}
! 			else
! 			{
! 				$this->lang_name = ($this->lang['default_lang']) ? $this->get_phpbb_lang($this->lang['default_lang']) : $board_config['default_lang'];
! 				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
! 			}
! 		}
  
  		// $lang == $this->lang
--- 717,721 ----
  	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
  	{
! 		global $phpbb_root_path, $phpEx;
  
  		// $lang == $this->lang
***************
*** 1051,1055 ****
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
!  
  			//fix for mxp
  			if ((@include $language_filename) === false)
--- 732,736 ----
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
! 
  			//fix for mxp
  			if ((@include $language_filename) === false)
***************
*** 1069,1077 ****
  			die("You should not use db with MX-Publisher!");
  		}
! 		
  		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;		
  	}
  
  }
  
--- 750,783 ----
  			die("You should not use db with MX-Publisher!");
  		}
! 
  		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;
  	}
  
+ 	/**
+ 	 * encode_lang
+ 	 *
+ 	 * $default_lang = $mx_user->encode_lang($board_config['default_lang']);
+ 	 *
+ 	 * @param unknown_type $lang
+ 	 * @return unknown
+ 	 */
+ 	function encode_lang($lang)
+ 	{
+ 		return $lang;
+ 	}
+ 
+ 	/**
+ 	 * decode_lang
+ 	 *
+ 	 * $default_lang = $mx_user->decode_lang($board_config['default_lang']);
+ 	 *
+ 	 * @param unknown_type $lang
+ 	 * @return unknown
+ 	 */
+ 	function decode_lang($lang)
+ 	{
+ 		return $lang;
+ 	}
  }
  

[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.23, 1.24

[Jon O. <jon...@us...>]

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

Modified Files:
	session.php 
Log Message:
Updated more generic initialization of styles and languages for backends.

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** session.php	10 Jul 2008 15:52:25 -0000	1.23
--- session.php	10 Jul 2008 20:46:36 -0000	1.24
***************
*** 83,86 ****
--- 83,101 ----
  
  	/**
+ 	 * Load sessions
+ 	 * @access public
+ 	 *
+ 	 */
+ 	function load()
+ 	{
+ 		global $board_config, $cache;
[...1435 lines suppressed...]
+ 					$lang_name = 'chinese';
+ 				break;
+ 				case 'zh_cmn_hans':
+ 					$lang_name = 'chinese_simplified';
+ 				break;
+ 				case 'zh_cmn_hant':
+ 					$lang_name = 'chinese_traditional';
+ 				break;
+ 				case 'zu':
+ 					$lang_name = 'zulu';
+ 				break;
+ 				default:
+ 					$lang_name = $lang;
+ 					break;
+ 			}
+ 		return $lang_name;
+ 	}
  }
  ?>
\ No newline at end of file

[mxbb-commits] core/includes mx_functions_phpbb.php, 1.71, 1.72 mx_functions_style.php, 1.78, 1.79

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_phpbb.php mx_functions_style.php 
Log Message:
Updated more generic initialization of styles and languages for backends.

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** mx_functions_style.php	9 Jul 2008 17:05:39 -0000	1.78
--- mx_functions_style.php	10 Jul 2008 20:46:36 -0000	1.79
***************
*** 20,24 ****
  include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/session.' . $phpEx);
  
! // Abstract layer for Internal, phpBB2 or phpBB3 based session handling.
  class mx_session extends session
  {
--- 20,29 ----
  include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/session.' . $phpEx);
  
! /**
!  * Sessions
[...1747 lines suppressed...]
  	 */
- 	/**
- 	 * Extend.
- 	 *
- 	 * Extend User Style with module lang and images.
- 	 *
- 	 * Usage:
- 	 * - $mx_user->extend(LANG, IMAGES)
- 	 *
- 	 * Switches:
- 	 * - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL
- 	 * - IMAGES: MX_IMAGES (default), MX_NO_IMAGES
- 	 *
- 	 * @access public
- 	 * @param unknown_type $lang_mode
- 	 * @param unknown_type $image_mode
- 	 */
  	function extend($lang_mode = MX_LANG_MAIN, $image_mode = MX_IMAGES)
  	{
--- 1351,1354 ----

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** mx_functions_phpbb.php	9 Jul 2008 14:53:55 -0000	1.71
--- mx_functions_phpbb.php	10 Jul 2008 20:46:36 -0000	1.72
***************
*** 261,265 ****
  	}
  
- 	//$default_lang = $mx_user->get_phpbb_lang($board_config['default_lang']);
  	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang'];
  
--- 261,264 ----
***************
*** 402,406 ****
  	$mx_page->init( $page_id );
  
! 	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->get_phpbb_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
  
  	if ( empty($default_lang) )
--- 401,405 ----
  	$mx_page->init( $page_id );
  
! 	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->encode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
  
  	if ( empty($default_lang) )

[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.22, 1.23

[FlorinCB <ory...@us...>]

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

Modified Files:
	session.php 
Log Message:
$mx_user->get_phpbb_lang()

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** session.php	9 Jul 2008 16:58:23 -0000	1.22
--- session.php	10 Jul 2008 15:52:25 -0000	1.23
***************
*** 1251,1255 ****
  		if ($this->data['user_id'] != ANONYMOUS)
  		{
! 			$this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->lang['user_lang'] . "/common.$phpEx")) ? $this->lang['user_lang'] : (file_exists($phpbb_root_path . 'language/' . $this->lang['default_lang'] . "/common.$phpEx")) ? basename($this->lang['default_lang']) : $board_config['phpbb_lang'];
  			$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
  
--- 1251,1255 ----
  		if ($this->data['user_id'] != ANONYMOUS)
  		{
! 			$this->lang_name = (file_exists($phpbb_root_path . 'language/' . get_phpbb_lang($this->lang['user_lang'], 'phpbb3') . "/common.$phpEx")) ? get_phpbb_lang($this->lang['user_lang'], 'phpbb3') : (file_exists($phpbb_root_path . 'language/' . get_phpbb_lang($this->lang['default_lang'], 'phpbb3') . "/common.$phpEx")) ? get_phpbb_lang($this->lang['default_lang'], 'phpbb3') : $board_config['phpbb_lang'];
  			$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
  

[mxbb-commits] core/templates/_core overall_header_navigation_phpbb.tpl, 1.4, 1.5

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15314

Modified Files:
	overall_header_navigation_phpbb.tpl 
Log Message:
edit_cp

Index: overall_header_navigation_phpbb.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/overall_header_navigation_phpbb.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** overall_header_navigation_phpbb.tpl	16 Jun 2008 14:41:41 -0000	1.4
--- overall_header_navigation_phpbb.tpl	10 Jul 2008 15:13:03 -0000	1.5
***************
*** 85,88 ****
--- 85,106 ----
  					</td>
  				</tr>
+ 				<!-- BEGIN editcp -->
+ 				<tr>
+ 					<td class="row2" align="center" valign="middle" colspan="3">
+ 						<div class="editCP_switch" style="display: {editcp.EDITCP_SHOW};">
+ 							<form action="{editcp.EDIT_ACTION}" method="post" class="mx_editform">
+ 								<table width="100%" cellpadding="0" cellspacing="0" border="0">
+ 									<tr>
+ 										<td align="right">
+ 											{editcp.EDIT_IMG}
+ 											{editcp.S_HIDDEN_FORM_FIELDS}
+ 										</td>
+ 									</tr>
+ 								</table>
+ 							</form>
+ 						</div>
+ 					</td>
+ 				</tr>
+ 				<!-- END editcp -->				
  				<tr>
  					<td class="cat" align="center" valign="middle" colspan="3">

[mxbb-commits] core/includes/sessions/internal session.php, 1.8, 1.9

[FlorinCB <ory...@us...>]

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

Modified Files:
	session.php 
Log Message:
not upgraded?

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** session.php	26 Jun 2008 22:02:01 -0000	1.8
--- session.php	10 Jul 2008 14:09:48 -0000	1.9
***************
*** 598,606 ****
  		}
  
! 		$board_config['default_lang'] = $this->get_old_lang($board_config['default_lang']); // This will expand the lang name		
  
  		if ($userdata['user_id'] != ANONYMOUS)
  		{
! 			$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_old_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_old_lang($userdata['user_lang']) : $board_config['default_lang'];
  			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  
--- 598,606 ----
  		}
  
! 		$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
  
  		if ($userdata['user_id'] != ANONYMOUS)
  		{
! 			$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($userdata['user_lang']) : $board_config['default_lang'];
  			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  
***************
*** 1024,1037 ****
  			}
  
! 			$board_config['default_lang'] = $this->get_old_lang($board_config['default_lang']); // This will expand the lang name		
  
  			if ($this->data['user_id'] != ANONYMOUS)
  			{
! 				$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_old_lang($this->data['user_lang']) . "/lang_main.$phpEx")) ? $this->get_old_lang($this->data['user_lang']) : $board_config['default_lang'];
  				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  			}
  			else
  			{
! 				$this->lang_name = ($this->lang['default_lang']) ? $this->get_old_lang($this->lang['default_lang']) : $board_config['default_lang'];
  				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  			}
--- 1024,1037 ----
  			}
  
! 			$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
  
  			if ($this->data['user_id'] != ANONYMOUS)
  			{
! 				$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($this->data['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($this->data['user_lang']) : $board_config['default_lang'];
  				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  			}
  			else
  			{
! 				$this->lang_name = ($this->lang['default_lang']) ? $this->get_phpbb_lang($this->lang['default_lang']) : $board_config['default_lang'];
  				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  			}

[mxbb-commits] core/templates/subsilver2 mx_main_layout.html, 1.1, 1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/templates/subsilver2
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16665/templates/subsilver2

Modified Files:
	mx_main_layout.html 
Log Message:
Cleaning up common.php, and moving some backend init methods to the cache class (where all load methods are defined)
Removed the template "border graphics" feature, since it has never been used.
Js bug in 2 adminCP files.

Index: mx_main_layout.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/subsilver2/mx_main_layout.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_main_layout.html	9 Sep 2007 16:50:46 -0000	1.1
--- mx_main_layout.html	9 Jul 2008 20:47:53 -0000	1.2
***************
*** 4,44 ****
  		<!-- BEGIN layout_column -->
  		<td class="{layout_column.COL_CLASS}" width="{layout_column.BLOCK_SIZE}">
! 			
  			<!-- BEGIN blocks -->
! 				
  			<!-- BEGIN sub_start -->
  			<table border="0" cellpadding="0" cellspacing="0" width="{layout_column.BLOCK_SIZE}">
  				<tr valign="top">
! 			<!-- END sub_start -->	
! 						
  					<!-- BEGIN sub_col -->
  					{layout_column.blocks.sub_col.INNER_SPACE}
  					<td class="{layout_column.blocks.sub_col.COL_CLASS}" width="{layout_column.blocks.sub_col.BLOCK_SIZE}">
  					<!-- END sub_col -->
! 							
  						 <table width="{layout_column.BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="mx_graphborder">
  							  <tr>
  								   <td>
! 								   
! 										<!-- BEGIN graph_border -->
! 										<table width="100%" cellpadding="0" cellspacing="0" border="0"> 
! 											<tr> 
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-1.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-2.gif" width="100%">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td>
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-3.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 											<tr> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-1.gif" width="5">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-2.gif" width="100%" align="center">
! 										<!-- END graph_border -->
! 										
  							  						<!-- BEGIN block_header -->
  							  						<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none; padding:1px 1px 0px 1px;">
--- 4,24 ----
  		<!-- BEGIN layout_column -->
  		<td class="{layout_column.COL_CLASS}" width="{layout_column.BLOCK_SIZE}">
! 
  			<!-- BEGIN blocks -->
! 
  			<!-- BEGIN sub_start -->
  			<table border="0" cellpadding="0" cellspacing="0" width="{layout_column.BLOCK_SIZE}">
  				<tr valign="top">
! 			<!-- END sub_start -->
! 
  					<!-- BEGIN sub_col -->
  					{layout_column.blocks.sub_col.INNER_SPACE}
  					<td class="{layout_column.blocks.sub_col.COL_CLASS}" width="{layout_column.blocks.sub_col.BLOCK_SIZE}">
  					<!-- END sub_col -->
! 
  						 <table width="{layout_column.BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="mx_graphborder">
  							  <tr>
  								   <td>
! 
  							  						<!-- BEGIN block_header -->
  							  						<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none; padding:1px 1px 0px 1px;">
***************
*** 46,52 ****
  							  								<td>
  										  						<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 										  							<tr>							  							
! 							  						<!-- END block_header -->		
! 									  													  						
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerL" align="left" width="100%">
--- 26,32 ----
  							  								<td>
  										  						<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 										  							<tr>
! 							  						<!-- END block_header -->
! 
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerL" align="left" width="100%">
***************
*** 54,71 ****
  																		</th>
  																		<!-- END show_title -->
! 										
  																		<!-- BEGIN edit -->
! 												  																										
  																		<th class="thTop" align="right" width="1">
  																			<div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};">
  																			<form action="{layout_column.blocks.edit.EDIT_ACTION}" method="post" class="mx_editform">
  																				<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 													
! 													  									<tr> 
  														  									<!-- BEGIN hidden_block -->
  																							<td align="right">
  																								<span class="gensmall"><i>{layout_column.blocks.edit.hidden_block.HIDDEN_BLOCK}</i></span>
! 																							</td>	  									
! 																							<!-- END hidden_block -->									
  																							<td align="right">
  														  										{layout_column.blocks.edit.EDIT_IMG}
--- 34,51 ----
  																		</th>
  																		<!-- END show_title -->
! 
  																		<!-- BEGIN edit -->
! 
  																		<th class="thTop" align="right" width="1">
  																			<div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};">
  																			<form action="{layout_column.blocks.edit.EDIT_ACTION}" method="post" class="mx_editform">
  																				<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 
! 													  									<tr>
  														  									<!-- BEGIN hidden_block -->
  																							<td align="right">
  																								<span class="gensmall"><i>{layout_column.blocks.edit.hidden_block.HIDDEN_BLOCK}</i></span>
! 																							</td>
! 																							<!-- END hidden_block -->
  																							<td align="right">
  														  										{layout_column.blocks.edit.EDIT_IMG}
***************
*** 73,90 ****
  														  									</td>
  													  									</tr>
! 																					
  																				</table>
  																			</form>
  																			</div>
  																		</th>
! 																		
  																		<!-- END edit -->
! 																		
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerR" align="right" width="1">
! 																			
  																		</th>
! 																		<!-- END show_title -->																		
! 															
  													<!-- BEGIN block_header -->
  																	</tr>
--- 53,70 ----
  														  									</td>
  													  									</tr>
! 
  																				</table>
  																			</form>
  																			</div>
  																		</th>
! 
  																		<!-- END edit -->
! 
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerR" align="right" width="1">
! 
  																		</th>
! 																		<!-- END show_title -->
! 
  													<!-- BEGIN block_header -->
  																	</tr>
***************
*** 93,102 ****
  														</tr>
  													</table>
! 													<!-- END block_header -->	
! 																
! 													<div id="block_{layout_column.blocks.BLOCK_ID}">					
! 													<table width="100%" cellpadding="0" cellspacing="0" border="0">	
  														<tr>
! 															<td>							
  																{layout_column.blocks.BLOCK}
  															</td>
--- 73,82 ----
  														</tr>
  													</table>
! 													<!-- END block_header -->
! 
! 													<div id="block_{layout_column.blocks.BLOCK_ID}">
! 													<table width="100%" cellpadding="0" cellspacing="0" border="0">
  														<tr>
! 															<td>
  																{layout_column.blocks.BLOCK}
  															</td>
***************
*** 104,152 ****
  													</table>
  													</div>
! 																			
! 										<!-- BEGIN graph_border -->
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-3.gif" width="5">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 							  				<tr> 
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-1.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-2.gif" width="100%">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td>
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-3.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 										</table> 
! 										<!-- END graph_border -->
! 										
  								    </td>
  							   </tr>
  						  </table>
! 			
  						<!-- BEGIN block_stats -->
  						<div align="right"><span class="copyright">{layout_column.blocks.block_stats.L_BLOCK_UPDATED}{layout_column.blocks.block_stats.EDITOR_NAME} ({layout_column.blocks.block_stats.EDIT_TIME})</span></div>
  						<br clear="all" />
  						<!-- END block_stats -->
! 							
! 						<!-- BEGIN no_stats -->			  
  						<br clear="all" />
  						<!-- END no_stats -->
! 			
  					<!-- BEGIN sub_col -->
  					</td>
  					<!-- END sub_col -->
! 					
  			<!-- BEGIN sub_end -->
  				</tr>
  			</table>
! 			<!-- END sub_end -->				
! 					
  			<!-- END blocks -->
! 			
  		</td>
  		<!-- END layout_column -->
--- 84,112 ----
  													</table>
  													</div>
! 
  								    </td>
  							   </tr>
  						  </table>
! 
  						<!-- BEGIN block_stats -->
  						<div align="right"><span class="copyright">{layout_column.blocks.block_stats.L_BLOCK_UPDATED}{layout_column.blocks.block_stats.EDITOR_NAME} ({layout_column.blocks.block_stats.EDIT_TIME})</span></div>
  						<br clear="all" />
  						<!-- END block_stats -->
! 
! 						<!-- BEGIN no_stats -->
  						<br clear="all" />
  						<!-- END no_stats -->
! 
  					<!-- BEGIN sub_col -->
  					</td>
  					<!-- END sub_col -->
! 
  			<!-- BEGIN sub_end -->
  				</tr>
  			</table>
! 			<!-- END sub_end -->
! 
  			<!-- END blocks -->
! 
  		</td>
  		<!-- END layout_column -->

[mxbb-commits] core/templates/_core/admin mx_modulecp_admin_body.tpl, 1.1, 1.2 mx_pagecp_admin_body.tpl, 1.2, 1.3

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/templates/_core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16665/templates/_core/admin

Modified Files:
	mx_modulecp_admin_body.tpl mx_pagecp_admin_body.tpl 
Log Message:
Cleaning up common.php, and moving some backend init methods to the cache class (where all load methods are defined)
Removed the template "border graphics" feature, since it has never been used.
Js bug in 2 adminCP files.

Index: mx_modulecp_admin_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/admin/mx_modulecp_admin_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_modulecp_admin_body.tpl	9 Sep 2007 16:54:28 -0000	1.1
--- mx_modulecp_admin_body.tpl	9 Jul 2008 20:47:53 -0000	1.2
***************
*** 230,234 ****
        return false;
     } else {
!       bbstyle(-1);
        //formObj.preview.disabled = true;
        //formObj.submit.disabled = true;
--- 230,236 ----
        return false;
     } else {
!    		if(bbstyle){
!       		bbstyle(-1);
!    		}
        //formObj.preview.disabled = true;
        //formObj.submit.disabled = true;

Index: mx_pagecp_admin_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/admin/mx_pagecp_admin_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_pagecp_admin_body.tpl	1 Mar 2008 21:18:35 -0000	1.2
--- mx_pagecp_admin_body.tpl	9 Jul 2008 20:47:53 -0000	1.3
***************
*** 253,257 ****
        	return false;
     	} else {
!       	bbstyle(-1);
        	//formObj.preview.disabled = true;
        	//formObj.submit.disabled = true;
--- 253,259 ----
        	return false;
     	} else {
!    		if(bbstyle){
!       		bbstyle(-1);
!    		}
        	//formObj.preview.disabled = true;
        	//formObj.submit.disabled = true;

[mxbb-commits] core/templates/mxSilver mx_main_layout.tpl,1.1,1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/templates/mxSilver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16665/templates/mxSilver

Modified Files:
	mx_main_layout.tpl 
Log Message:
Cleaning up common.php, and moving some backend init methods to the cache class (where all load methods are defined)
Removed the template "border graphics" feature, since it has never been used.
Js bug in 2 adminCP files.

Index: mx_main_layout.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/mxSilver/mx_main_layout.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_main_layout.tpl	9 Sep 2007 16:50:46 -0000	1.1
--- mx_main_layout.tpl	9 Jul 2008 20:47:53 -0000	1.2
***************
*** 4,44 ****
  		<!-- BEGIN layout_column -->
  		<td class="{layout_column.COL_CLASS}" width="{layout_column.BLOCK_SIZE}">
! 			
  			<!-- BEGIN blocks -->
! 				
  			<!-- BEGIN sub_start -->
  			<table border="0" cellpadding="0" cellspacing="0" width="{layout_column.BLOCK_SIZE}">
  				<tr valign="top">
! 			<!-- END sub_start -->	
! 						
  					<!-- BEGIN sub_col -->
  					{layout_column.blocks.sub_col.INNER_SPACE}
  					<td class="{layout_column.blocks.sub_col.COL_CLASS}" width="{layout_column.blocks.sub_col.BLOCK_SIZE}">
  					<!-- END sub_col -->
! 							
  						 <table width="{layout_column.BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="mx_graphborder">
  							  <tr>
  								   <td>
! 								   
! 										<!-- BEGIN graph_border -->
! 										<table width="100%" cellpadding="0" cellspacing="0" border="0"> 
! 											<tr> 
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-1.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-2.gif" width="100%">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td>
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-3.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 											<tr> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-1.gif" width="5">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-2.gif" width="100%" align="center">
! 										<!-- END graph_border -->
! 										
  							  						<!-- BEGIN block_header -->
  							  						<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none; padding:1px 1px 0px 1px;">
--- 4,24 ----
  		<!-- BEGIN layout_column -->
  		<td class="{layout_column.COL_CLASS}" width="{layout_column.BLOCK_SIZE}">
! 
  			<!-- BEGIN blocks -->
! 
  			<!-- BEGIN sub_start -->
  			<table border="0" cellpadding="0" cellspacing="0" width="{layout_column.BLOCK_SIZE}">
  				<tr valign="top">
! 			<!-- END sub_start -->
! 
  					<!-- BEGIN sub_col -->
  					{layout_column.blocks.sub_col.INNER_SPACE}
  					<td class="{layout_column.blocks.sub_col.COL_CLASS}" width="{layout_column.blocks.sub_col.BLOCK_SIZE}">
  					<!-- END sub_col -->
! 
  						 <table width="{layout_column.BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="mx_graphborder">
  							  <tr>
  								   <td>
! 
  							  						<!-- BEGIN block_header -->
  							  						<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none; padding:1px 1px 0px 1px;">
***************
*** 46,52 ****
  							  								<td>
  										  						<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 										  							<tr>							  							
! 							  						<!-- END block_header -->		
! 									  													  						
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerL" align="left" width="100%">
--- 26,32 ----
  							  								<td>
  										  						<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 										  							<tr>
! 							  						<!-- END block_header -->
! 
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerL" align="left" width="100%">
***************
*** 54,71 ****
  																		</th>
  																		<!-- END show_title -->
! 										
  																		<!-- BEGIN edit -->
! 												  																										
  																		<th class="thTop" align="right" width="1">
  																			<div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};">
  																			<form action="{layout_column.blocks.edit.EDIT_ACTION}" method="post" class="mx_editform">
  																				<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 													
! 													  									<tr> 
  														  									<!-- BEGIN hidden_block -->
  																							<td align="right">
  																								<span class="gensmall"><i>{layout_column.blocks.edit.hidden_block.HIDDEN_BLOCK}</i></span>
! 																							</td>	  									
! 																							<!-- END hidden_block -->									
  																							<td align="right">
  														  										{layout_column.blocks.edit.EDIT_IMG}
--- 34,51 ----
  																		</th>
  																		<!-- END show_title -->
! 
  																		<!-- BEGIN edit -->
! 
  																		<th class="thTop" align="right" width="1">
  																			<div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};">
  																			<form action="{layout_column.blocks.edit.EDIT_ACTION}" method="post" class="mx_editform">
  																				<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 
! 													  									<tr>
  														  									<!-- BEGIN hidden_block -->
  																							<td align="right">
  																								<span class="gensmall"><i>{layout_column.blocks.edit.hidden_block.HIDDEN_BLOCK}</i></span>
! 																							</td>
! 																							<!-- END hidden_block -->
  																							<td align="right">
  														  										{layout_column.blocks.edit.EDIT_IMG}
***************
*** 73,90 ****
  														  									</td>
  													  									</tr>
! 																					
  																				</table>
  																			</form>
  																			</div>
  																		</th>
! 																		
  																		<!-- END edit -->
! 																		
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerR" align="right" width="1">
! 																			
  																		</th>
! 																		<!-- END show_title -->																		
! 															
  													<!-- BEGIN block_header -->
  																	</tr>
--- 53,70 ----
  														  									</td>
  													  									</tr>
! 
  																				</table>
  																			</form>
  																			</div>
  																		</th>
! 
  																		<!-- END edit -->
! 
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerR" align="right" width="1">
! 
  																		</th>
! 																		<!-- END show_title -->
! 
  													<!-- BEGIN block_header -->
  																	</tr>
***************
*** 93,102 ****
  														</tr>
  													</table>
! 													<!-- END block_header -->	
! 																
! 													<div id="block_{layout_column.blocks.BLOCK_ID}">					
! 													<table width="100%" cellpadding="0" cellspacing="0" border="0">	
  														<tr>
! 															<td>							
  																{layout_column.blocks.BLOCK}
  															</td>
--- 73,82 ----
  														</tr>
  													</table>
! 													<!-- END block_header -->
! 
! 													<div id="block_{layout_column.blocks.BLOCK_ID}">
! 													<table width="100%" cellpadding="0" cellspacing="0" border="0">
  														<tr>
! 															<td>
  																{layout_column.blocks.BLOCK}
  															</td>
***************
*** 104,152 ****
  													</table>
  													</div>
! 																			
! 										<!-- BEGIN graph_border -->
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-3.gif" width="5">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 							  				<tr> 
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-1.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-2.gif" width="100%">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td>
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-3.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 										</table> 
! 										<!-- END graph_border -->
! 										
  								    </td>
  							   </tr>
  						  </table>
! 			
  						<!-- BEGIN block_stats -->
  						<div align="right"><span class="copyright">{layout_column.blocks.block_stats.L_BLOCK_UPDATED}{layout_column.blocks.block_stats.EDITOR_NAME} ({layout_column.blocks.block_stats.EDIT_TIME})</span></div>
  						<br clear="all" />
  						<!-- END block_stats -->
! 							
! 						<!-- BEGIN no_stats -->			  
  						<br clear="all" />
  						<!-- END no_stats -->
! 			
  					<!-- BEGIN sub_col -->
  					</td>
  					<!-- END sub_col -->
! 					
  			<!-- BEGIN sub_end -->
  				</tr>
  			</table>
! 			<!-- END sub_end -->				
! 					
  			<!-- END blocks -->
! 			
  		</td>
  		<!-- END layout_column -->
--- 84,112 ----
  													</table>
  													</div>
! 
  								    </td>
  							   </tr>
  						  </table>
! 
  						<!-- BEGIN block_stats -->
  						<div align="right"><span class="copyright">{layout_column.blocks.block_stats.L_BLOCK_UPDATED}{layout_column.blocks.block_stats.EDITOR_NAME} ({layout_column.blocks.block_stats.EDIT_TIME})</span></div>
  						<br clear="all" />
  						<!-- END block_stats -->
! 
! 						<!-- BEGIN no_stats -->
  						<br clear="all" />
  						<!-- END no_stats -->
! 
  					<!-- BEGIN sub_col -->
  					</td>
  					<!-- END sub_col -->
! 
  			<!-- BEGIN sub_end -->
  				</tr>
  			</table>
! 			<!-- END sub_end -->
! 
  			<!-- END blocks -->
! 
  		</td>
  		<!-- END layout_column -->

[mxbb-commits] core/templates/_core mx_main_layout.tpl,1.1,1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16665/templates/_core

Modified Files:
	mx_main_layout.tpl 
Log Message:
Cleaning up common.php, and moving some backend init methods to the cache class (where all load methods are defined)
Removed the template "border graphics" feature, since it has never been used.
Js bug in 2 adminCP files.

Index: mx_main_layout.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/mx_main_layout.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_main_layout.tpl	9 Sep 2007 16:50:45 -0000	1.1
--- mx_main_layout.tpl	9 Jul 2008 20:47:53 -0000	1.2
***************
*** 4,44 ****
  		<!-- BEGIN layout_column -->
  		<td class="{layout_column.COL_CLASS}" width="{layout_column.BLOCK_SIZE}">
! 			
  			<!-- BEGIN blocks -->
! 				
  			<!-- BEGIN sub_start -->
  			<table border="0" cellpadding="0" cellspacing="0" width="{layout_column.BLOCK_SIZE}">
  				<tr valign="top">
! 			<!-- END sub_start -->	
! 						
  					<!-- BEGIN sub_col -->
  					{layout_column.blocks.sub_col.INNER_SPACE}
  					<td class="{layout_column.blocks.sub_col.COL_CLASS}" width="{layout_column.blocks.sub_col.BLOCK_SIZE}">
  					<!-- END sub_col -->
! 							
  						 <table width="{layout_column.BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="mx_graphborder">
  							  <tr>
  								   <td>
! 								   
! 										<!-- BEGIN graph_border -->
! 										<table width="100%" cellpadding="0" cellspacing="0" border="0"> 
! 											<tr> 
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-1.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-2.gif" width="100%">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td>
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}1-3.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 											<tr> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-1.gif" width="5">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-2.gif" width="100%" align="center">
! 										<!-- END graph_border -->
! 										
  							  						<!-- BEGIN block_header -->
  							  						<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none; padding:1px 1px 0px 1px;">
--- 4,24 ----
  		<!-- BEGIN layout_column -->
  		<td class="{layout_column.COL_CLASS}" width="{layout_column.BLOCK_SIZE}">
! 
  			<!-- BEGIN blocks -->
! 
  			<!-- BEGIN sub_start -->
  			<table border="0" cellpadding="0" cellspacing="0" width="{layout_column.BLOCK_SIZE}">
  				<tr valign="top">
! 			<!-- END sub_start -->
! 
  					<!-- BEGIN sub_col -->
  					{layout_column.blocks.sub_col.INNER_SPACE}
  					<td class="{layout_column.blocks.sub_col.COL_CLASS}" width="{layout_column.blocks.sub_col.BLOCK_SIZE}">
  					<!-- END sub_col -->
! 
  						 <table width="{layout_column.BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="mx_graphborder">
  							  <tr>
  								   <td>
! 
  							  						<!-- BEGIN block_header -->
  							  						<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none; padding:1px 1px 0px 1px;">
***************
*** 46,52 ****
  							  								<td>
  										  						<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 										  							<tr>							  							
! 							  						<!-- END block_header -->		
! 									  													  						
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerL" align="left" width="100%">
--- 26,32 ----
  							  								<td>
  										  						<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 										  							<tr>
! 							  						<!-- END block_header -->
! 
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerL" align="left" width="100%">
***************
*** 54,71 ****
  																		</th>
  																		<!-- END show_title -->
! 										
  																		<!-- BEGIN edit -->
! 												  																										
  																		<th class="thTop" align="right" width="1">
  																			<div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};">
  																			<form action="{layout_column.blocks.edit.EDIT_ACTION}" method="post" class="mx_editform">
  																				<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 													
! 													  									<tr> 
  														  									<!-- BEGIN hidden_block -->
  																							<td align="right">
  																								<span class="gensmall"><i>{layout_column.blocks.edit.hidden_block.HIDDEN_BLOCK}</i></span>
! 																							</td>	  									
! 																							<!-- END hidden_block -->									
  																							<td align="right">
  														  										{layout_column.blocks.edit.EDIT_IMG}
--- 34,51 ----
  																		</th>
  																		<!-- END show_title -->
! 
  																		<!-- BEGIN edit -->
! 
  																		<th class="thTop" align="right" width="1">
  																			<div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};">
  																			<form action="{layout_column.blocks.edit.EDIT_ACTION}" method="post" class="mx_editform">
  																				<table width="100%" cellpadding="0" cellspacing="0" border="0">
! 
! 													  									<tr>
  														  									<!-- BEGIN hidden_block -->
  																							<td align="right">
  																								<span class="gensmall"><i>{layout_column.blocks.edit.hidden_block.HIDDEN_BLOCK}</i></span>
! 																							</td>
! 																							<!-- END hidden_block -->
  																							<td align="right">
  														  										{layout_column.blocks.edit.EDIT_IMG}
***************
*** 73,90 ****
  														  									</td>
  													  									</tr>
! 																					
  																				</table>
  																			</form>
  																			</div>
  																		</th>
! 																		
  																		<!-- END edit -->
! 																		
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerR" align="right" width="1">
! 																			
  																		</th>
! 																		<!-- END show_title -->																		
! 															
  													<!-- BEGIN block_header -->
  																	</tr>
--- 53,70 ----
  														  									</td>
  													  									</tr>
! 
  																				</table>
  																			</form>
  																			</div>
  																		</th>
! 
  																		<!-- END edit -->
! 
  											 							<!-- BEGIN show_title -->
  																		<th class="thCornerR" align="right" width="1">
! 
  																		</th>
! 																		<!-- END show_title -->
! 
  													<!-- BEGIN block_header -->
  																	</tr>
***************
*** 93,102 ****
  														</tr>
  													</table>
! 													<!-- END block_header -->	
! 																
! 													<div id="block_{layout_column.blocks.BLOCK_ID}">					
! 													<table width="100%" cellpadding="0" cellspacing="0" border="0">	
  														<tr>
! 															<td>							
  																{layout_column.blocks.BLOCK}
  															</td>
--- 73,82 ----
  														</tr>
  													</table>
! 													<!-- END block_header -->
! 
! 													<div id="block_{layout_column.blocks.BLOCK_ID}">
! 													<table width="100%" cellpadding="0" cellspacing="0" border="0">
  														<tr>
! 															<td>
  																{layout_column.blocks.BLOCK}
  															</td>
***************
*** 104,152 ****
  													</table>
  													</div>
! 																			
! 										<!-- BEGIN graph_border -->
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}2-3.gif" width="5">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 							  				<tr> 
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-1.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 							  					<td background="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-2.gif" width="100%">
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/spacer.gif" width="5" height="5" alt="" />
! 							  					</td>
! 							  					<td>
! 							  						<img src="{layout_column.blocks.graph_border.TEMPLATE_ROOT_PATH}images/{layout_column.blocks.graph_border.PREFIX}3-3.gif" width="5" height="5" alt="" />
! 							  					</td> 
! 											</tr> 
! 										</table> 
! 										<!-- END graph_border -->
! 										
  								    </td>
  							   </tr>
  						  </table>
! 			
  						<!-- BEGIN block_stats -->
  						<div align="right"><span class="copyright">{layout_column.blocks.block_stats.L_BLOCK_UPDATED}{layout_column.blocks.block_stats.EDITOR_NAME} ({layout_column.blocks.block_stats.EDIT_TIME})</span></div>
  						<br clear="all" />
  						<!-- END block_stats -->
! 							
! 						<!-- BEGIN no_stats -->			  
  						<br clear="all" />
  						<!-- END no_stats -->
! 			
  					<!-- BEGIN sub_col -->
  					</td>
  					<!-- END sub_col -->
! 					
  			<!-- BEGIN sub_end -->
  				</tr>
  			</table>
! 			<!-- END sub_end -->				
! 					
  			<!-- END blocks -->
! 			
  		</td>
  		<!-- END layout_column -->
--- 84,112 ----
  													</table>
  													</div>
! 
  								    </td>
  							   </tr>
  						  </table>
! 
  						<!-- BEGIN block_stats -->
  						<div align="right"><span class="copyright">{layout_column.blocks.block_stats.L_BLOCK_UPDATED}{layout_column.blocks.block_stats.EDITOR_NAME} ({layout_column.blocks.block_stats.EDIT_TIME})</span></div>
  						<br clear="all" />
  						<!-- END block_stats -->
! 
! 						<!-- BEGIN no_stats -->
  						<br clear="all" />
  						<!-- END no_stats -->
! 
  					<!-- BEGIN sub_col -->
  					</td>
  					<!-- END sub_col -->
! 
  			<!-- BEGIN sub_end -->
  				</tr>
  			</table>
! 			<!-- END sub_end -->
! 
  			<!-- END blocks -->
! 
  		</td>
  		<!-- END layout_column -->

[mxbb-commits] core common.php,1.93,1.94 index.php,1.77,1.78

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16665

Modified Files:
	common.php index.php 
Log Message:
Cleaning up common.php, and moving some backend init methods to the cache class (where all load methods are defined)
Removed the template "border graphics" feature, since it has never been used.
Js bug in 2 adminCP files.

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** common.php	16 Jun 2008 10:46:37 -0000	1.93
--- common.php	9 Jul 2008 20:47:51 -0000	1.94
***************
*** 213,272 ****
  
  //
- // Get MX-Publisher config settings
- //
- $portal_config = $mx_cache->obtain_mxbb_config();
- 
- if ($portal_config['portal_version'] == '')
- {
- 	$portal_config = $mx_cache->obtain_mxbb_config(false);
- }
- 
- //
  // Define Users/Group/Sessions backend, and validate
  //
! $table_prefix = '';
! switch ($portal_config['portal_backend'])
! {
! 	case 'internal':
! 		$phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/';
! 		str_replace("//", "/", $phpbb_root_path);
! 		$portal_backend_valid_file = true;
! 		$table_prefix = 'phpBB_';
! 		$tplEx = 'tpl';
! 		break;
! 	case 'phpbb2':
! 		$phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path'];
! 		str_replace("//", "/", $phpbb_root_path);
! 		$portal_backend_valid_file = @file_exists($phpbb_root_path . "modcp.$phpEx");
! 		@include_once($phpbb_root_path . 'config.' . $phpEx);
! 		$tplEx = 'tpl';
! 		$_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" );
! 		$portal_backend_valid_db = $db->sql_numrows( $_result ) != 0;
! 		break;
! 	case 'phpbb3':
! 		$phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path'];
! 		str_replace("//", "/", $phpbb_root_path);
! 		$portal_backend_valid_file = @file_exists($phpbb_root_path . "mcp.$phpEx");
! 		@include_once($phpbb_root_path . 'config.' . $phpEx);
! 		$tplEx = 'html';
! 		$_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" );
! 		$portal_backend_valid_db = $db->sql_numrows( $_result ) != 0;
! 		break;
! }
! 
! if (!$portal_backend_valid_file || empty($table_prefix) || !$portal_backend_valid_db)
! {
! 	//
! 	// If phpBB setup is bad, revert to standalone. Thus we can access the adminCP ;)
! 	//
! 	define('PORTAL_BACKEND', 'internal');
! 	$phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/';
! 	str_replace("//", "/", $phpbb_root_path);
! 	$tplEx = 'tpl';
! }
! else
! {
! 	define('PORTAL_BACKEND', $portal_config['portal_backend']);
! }
  
  //
--- 213,220 ----
  
  //
  // Define Users/Group/Sessions backend, and validate
+ // Set $portal_config, $phpbb_root_path, $tplEx, $table_prefix & PORTAL_BACKEND
  //
! $mx_cache->load_backend();
  
  //
***************
*** 285,300 ****
  // Instantiate the mx_mod_rewrite class (if activated)
  //
! if ($portal_config['mod_rewrite'])
! {
! 	if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.' . $phpEx ) )
! 	{
! 		include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.' . $phpEx );
! 
! 		if (class_exists('mx_mod_rewrite'))
! 		{
! 			$mx_mod_rewrite = new mx_mod_rewrite();
! 		}
! 	}
! }
  
  //
--- 233,237 ----
  // Instantiate the mx_mod_rewrite class (if activated)
  //
! $mx_cache->init_mod_rewrite();
  
  //
***************
*** 313,322 ****
  $mx_block = new mx_block();
  
- // Obtain and encode users IP
  //
! // I'm removing HTTP_X_FORWARDED_FOR ... this may well cause other problems such as
! // private range IP's appearing instead of the guilty routable IP, tough, don't
! // even bother complaining ... go scream and shout at the idiots out there who feel
! // "clever" is doing harm rather than good ... karma is a great thing ... :)
  //
  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') );
--- 250,255 ----
  $mx_block = new mx_block();
  
  //
! // Obtain and encode users IP
  //
  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') );
***************
*** 324,379 ****
  
  //
! // Define some general Defs
! //
! $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path']));
! $server_name = trim($portal_config['server_name']);
! $server_protocol = ( $portal_config['cookie_secure'] ) ? 'https://' : 'http://';
! $server_port = ( $portal_config['server_port'] <> 80 ) ? ':' . trim($portal_config['server_port']) . '/' : '/';
! 
! $server_url = $server_protocol . str_replace("//", "/", $server_name . $server_port . $script_name . '/'); //On some server the slash is not added and this trick will fix it
! 
! define('PORTAL_URL', $server_url);
! define('PORTAL_VERSION', $portal_config['portal_version']);
! 
! //
! // Setup forum wide options, if this fails
! // then we output a CRITICAL_ERROR since
! // basic forum information is not available
  //
! switch (PORTAL_BACKEND)
! {
! 	case 'internal':
! 		$board_config = array();
! 		$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim('includes/shared/phpbb2/')) . '/';
! 		break;
! 
! 	case 'phpbb2':
! 		if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) )
! 		{
! 			include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx);
! 		}
! 		else
! 		{
! 			//
! 			// Grab phpBB global variables, re-cache if necessary
! 			// - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings
! 			// - true: enable cache, false: disable cache
! 			$board_config = $mx_cache->obtain_phpbb_config(false);
! 		}
! 		$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/';
! 		break;
! 
! 	case 'phpbb3':
! 		//
! 		// Grab phpBB global variables, re-cache if necessary
! 		// - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings
! 		// - true: enable cache, false: disable cache
! 		$board_config = $mx_cache->obtain_phpbb_config(false);
! 		$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/';
! 		break;
! }
! 
! $server_url_phpbb = $server_protocol . $server_name . $server_port . $script_name_phpbb;
! define('PHPBB_URL', $server_url_phpbb);
  
  //
--- 257,264 ----
  
  //
! // Define some general backend definitions
! // PORTAL_URL, PHPBB_URL, PORTAL_VERSION & $board_config
  //
! $mx_cache->setup_backend();
  
  //

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** index.php	15 Jun 2008 09:15:42 -0000	1.77
--- index.php	9 Jul 2008 20:47:52 -0000	1.78
***************
*** 220,231 ****
  
  						//
- 						// Switch: Block border graphics?
- 						//
- 						if ( $mx_page->block_border_graphics && $mx_block->module_root_path != 'modules/mx_phpbb/')
- 						{
- 							$mx_block->output_border_graphics();
- 						}
- 
- 						//
  						// Output Block stats
  						//
--- 220,223 ----

[mxbb-commits] core/includes mx_functions_core.php,1.89,1.90

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_core.php 
Log Message:
Cleaning up common.php, and moving some backend init methods to the cache class (where all load methods are defined)
Removed the template "border graphics" feature, since it has never been used.
Js bug in 2 adminCP files.

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** mx_functions_core.php	15 Jun 2008 21:00:01 -0000	1.89
--- mx_functions_core.php	9 Jul 2008 20:47:53 -0000	1.90
***************
*** 197,200 ****
--- 197,353 ----
  
  	/**
+ 	 * load_backend
+ 	 *
+ 	 * Define Users/Group/Sessions backend, and validate
+ 	 * Set $portal_config, $phpbb_root_path, $tplEx, $table_prefix & PORTAL_BACKEND
+ 	 *
+ 	 */
+ 	function load_backend()
+ 	{
+ 		global $db, $portal_config, $phpbb_root_path, $mx_root_path;
+ 		global $table_prefix, $phpEx, $tplEx;
+ 
+ 		//
+ 		// Get MX-Publisher config settings
+ 		//
+ 		$portal_config = $this->obtain_mxbb_config();
+ 
+ 		if ($portal_config['portal_version'] == '')
+ 		{
+ 			$portal_config = $this->obtain_mxbb_config(false);
+ 		}
+ 
+ 		$table_prefix = '';
+ 		switch ($portal_config['portal_backend'])
+ 		{
+ 			case 'internal':
+ 				$phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/';
+ 				str_replace("//", "/", $phpbb_root_path);
+ 				$portal_backend_valid_file = true;
+ 				$table_prefix = 'phpBB_';
+ 				$tplEx = 'tpl';
+ 				break;
+ 			case 'phpbb2':
+ 				$phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path'];
+ 				str_replace("//", "/", $phpbb_root_path);
+ 				$portal_backend_valid_file = @file_exists($phpbb_root_path . "modcp.$phpEx");
+ 				@include_once($phpbb_root_path . 'config.' . $phpEx);
+ 				$tplEx = 'tpl';
+ 				$_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" );
+ 				$portal_backend_valid_db = $db->sql_numrows( $_result ) != 0;
+ 				break;
+ 			case 'phpbb3':
+ 				$phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path'];
+ 				str_replace("//", "/", $phpbb_root_path);
+ 				$portal_backend_valid_file = @file_exists($phpbb_root_path . "mcp.$phpEx");
+ 				@include_once($phpbb_root_path . 'config.' . $phpEx);
+ 				$tplEx = 'html';
+ 				$_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" );
+ 				$portal_backend_valid_db = $db->sql_numrows( $_result ) != 0;
+ 				break;
+ 		}
+ 
+ 		if (!$portal_backend_valid_file || empty($table_prefix) || !$portal_backend_valid_db)
+ 		{
+ 			//
+ 			// If phpBB setup is bad, revert to standalone. Thus we can access the adminCP ;)
+ 			//
+ 			define('PORTAL_BACKEND', 'internal');
+ 			$phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/';
+ 			str_replace("//", "/", $phpbb_root_path);
+ 			$tplEx = 'tpl';
+ 		}
+ 		else
+ 		{
+ 			define('PORTAL_BACKEND', $portal_config['portal_backend']);
+ 		}
+ 	}
+ 
+ 	/**
+ 	 * setup_backend
+ 	 *
+ 	 * Define some general backend definitions
+ 	 * PORTAL_URL, PHPBB_URL, PORTAL_VERSION & $board_config
+ 	 *
+ 	 */
+ 	function setup_backend()
+ 	{
+ 		global $portal_config, $board_config, $phpbb_root_path;
+ 
+ 		$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path']));
+ 		$server_name = trim($portal_config['server_name']);
+ 		$server_protocol = ( $portal_config['cookie_secure'] ) ? 'https://' : 'http://';
+ 		$server_port = ( $portal_config['server_port'] <> 80 ) ? ':' . trim($portal_config['server_port']) . '/' : '/';
+ 
+ 		$server_url = $server_protocol . str_replace("//", "/", $server_name . $server_port . $script_name . '/'); //On some server the slash is not added and this trick will fix it
+ 
+ 		define('PORTAL_URL', $server_url);
+ 		define('PORTAL_VERSION', $portal_config['portal_version']);
+ 
+ 		//
+ 		// Setup forum wide options, if this fails
+ 		// then we output a CRITICAL_ERROR since
+ 		// basic forum information is not available
+ 		//
+ 		switch (PORTAL_BACKEND)
+ 		{
+ 			case 'internal':
+ 				$board_config = array();
+ 				$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim('includes/shared/phpbb2/')) . '/';
+ 				break;
+ 
+ 			case 'phpbb2':
+ 				if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) )
+ 				{
+ 					include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx);
+ 				}
+ 				else
+ 				{
+ 					//
+ 					// Grab phpBB global variables, re-cache if necessary
+ 					// - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings
+ 					// - true: enable cache, false: disable cache
+ 					$board_config = $this->obtain_phpbb_config(false);
+ 				}
+ 				$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/';
+ 				break;
+ 
+ 			case 'phpbb3':
+ 				//
+ 				// Grab phpBB global variables, re-cache if necessary
+ 				// - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings
+ 				// - true: enable cache, false: disable cache
+ 				$board_config = $this->obtain_phpbb_config(false);
+ 				$script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/';
+ 				break;
+ 		}
+ 
+ 		$server_url_phpbb = $server_protocol . $server_name . $server_port . $script_name_phpbb;
+ 		define('PHPBB_URL', $server_url_phpbb);
+ 	}
+ 
+ 	/**
+ 	 * Enter description here...
+ 	 *
+ 	 */
+ 	function init_mod_rewrite()
+ 	{
+ 		global $portal_config, $mx_root_path, $phpEx, $mx_mod_rewrite;
+ 
+ 		if ($portal_config['mod_rewrite'])
+ 		{
+ 			if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.' . $phpEx ) )
+ 			{
+ 				include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_functions.' . $phpEx );
+ 
+ 				if (class_exists('mx_mod_rewrite'))
+ 				{
+ 					$mx_mod_rewrite = new mx_mod_rewrite();
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	/**
  	 * Read.
  	 *
***************
*** 1721,1740 ****
  
  	/**
- 	 * Block border graphics.
- 	 *
- 	 * This switch allows code within the 'block_border_graphics' temnplate environment.
- 	 *
- 	 * @access public
- 	 */
- 	function output_border_graphics()
- 	{
- 		global $layouttemplate;
- 
- 		$layouttemplate->assign_block_vars('layout_column.blocks.graph_border', array(
- 			'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH
- 		));
- 	}
- 
- 	/**
  	 * Output block stats.
  	 * @access public
--- 1874,1877 ----

[mxbb-commits] core/includes mx_functions_style.php,1.77,1.78

[FlorinCB <ory...@us...>]

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

Modified Files:
	mx_functions_style.php 
Log Message:
fix

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** mx_functions_style.php	9 Jul 2008 16:56:41 -0000	1.77
--- mx_functions_style.php	9 Jul 2008 17:05:39 -0000	1.78
***************
*** 589,595 ****
  		if ( ($this->data['user_id'] != ANONYMOUS || $this->data['user_id'] != 1) && $this->data['user_lang'] !== $this->lang['default_lang'] )
  		{
! 			$sql = 'UPDATE ' . USERS_TABLE . "
! 				SET user_lang = '" . $this->lang['default_lang'] . "'
! 				WHERE user_lang = '" . $this->data['user_lang'] . "'";
  
  			if ( !($result = $db->sql_query($sql)) )
--- 589,608 ----
  		if ( ($this->data['user_id'] != ANONYMOUS || $this->data['user_id'] != 1) && $this->data['user_lang'] !== $this->lang['default_lang'] )
  		{
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 					$sql = 'UPDATE ' . USERS_TABLE . "
! 						SET user_lang = '" . $this->lang['default_lang'] . "'
! 						WHERE user_lang = '" . $this->data['user_lang'] . "'";				
! 				break;
! 				
! 				case 'phpbb2':
! 				case 'phpbb3':
! 					$sql = 'UPDATE ' . USERS_TABLE . "
! 						SET user_lang = '" . $this->get_phpbb_lang($this->lang['default_lang'], PORTAL_BACKEND) . "'
! 						WHERE user_lang = '" . $this->get_phpbb_lang($this->data['user_lang'], PORTAL_BACKEND) . "'";
! 				break;
! 			}		
! 
  
  			if ( !($result = $db->sql_query($sql)) )

[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.21, 1.22

[FlorinCB <ory...@us...>]

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

Modified Files:
	session.php 
Log Message:
$mx_user->get_phpbb_lang()

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** session.php	26 Jun 2008 22:02:02 -0000	1.21
--- session.php	9 Jul 2008 16:58:23 -0000	1.22
***************
*** 1260,1264 ****
  		else
  		{
! 			$this->lang_name = ($this->lang['default_lang']) ? basename($this->lang['default_lang']) : $board_config['phpbb_lang'];
  			$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
  			$this->date_format = $board_config['default_dateformat'];
--- 1260,1264 ----
  		else
  		{
! 			$this->lang_name = ($this->lang['default_lang']) ? get_phpbb_lang($this->lang['default_lang'], 'phpbb3') : $board_config['phpbb_lang'];
  			$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
  			$this->date_format = $board_config['default_dateformat'];

[mxbb-commits] core/includes mx_functions_style.php,1.76,1.77

[FlorinCB <ory...@us...>]

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

Modified Files:
	mx_functions_style.php 
Log Message:
$mx_user->get_phpbb_lang()

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** mx_functions_style.php	9 Jul 2008 14:53:55 -0000	1.76
--- mx_functions_style.php	9 Jul 2008 16:56:41 -0000	1.77
***************
*** 581,585 ****
  			if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) )
  			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx);
  			}
  		}
--- 581,585 ----
  			if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) )
  			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang'], 'phpbb2') . '/lang_main.'.$phpEx);
  			}
[...1324 lines suppressed...]
! 				case 'zh':
! 					$lang_name = 'chinese';
  				break;
! 				case 'zh_cmn_hans':
! 					$lang_name = 'chinese_simplified';
  				break;
! 				case 'zh_cmn_hant':
! 					$lang_name = 'chinese_traditional';
  				break;
! 				case 'zu':
! 					$lang_name = 'zulu';
  				break;
! 				default:
! 					$lang_name = $lang;
! 					break;
! 			}		
! 		}		
! 		return $lang_name;
  	}
  

[mxbb-commits] core/includes/sessions/phpbb2 session.php,1.7,1.8

[FlorinCB <ory...@us...>]

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

Modified Files:
	session.php 
Log Message:
get_old_lang -> get_phpbb_lang

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** session.php	26 Jun 2008 22:02:02 -0000	1.7
--- session.php	9 Jul 2008 14:54:36 -0000	1.8
***************
*** 601,609 ****
  		}
  
! 		$board_config['default_lang'] = $this->get_old_lang($board_config['default_lang']); // This will expand the lang name		
  
  		if ($userdata['user_id'] != ANONYMOUS)
  		{
! 			$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_old_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_old_lang($userdata['user_lang']) : $board_config['default_lang'];
  			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  
--- 601,609 ----
  		}
  
! 		$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
  
  		if ($userdata['user_id'] != ANONYMOUS)
  		{
! 			$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($userdata['user_lang']) : $board_config['default_lang'];
  			$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  
***************
*** 1026,1034 ****
  			}
  
! 			$board_config['default_lang'] = $this->get_old_lang($board_config['default_lang']); // This will expand the lang name		
  
  			if ($userdata['user_id'] != ANONYMOUS)
  			{
! 				$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_old_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_old_lang($userdata['user_lang']) : $board_config['default_lang'];
  				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  			}
--- 1026,1034 ----
  			}
  
! 			$board_config['default_lang'] = $this->get_phpbb_lang($board_config['default_lang']); // This will expand the lang name		
  
  			if ($userdata['user_id'] != ANONYMOUS)
  			{
! 				$this->lang_name = (file_exists($phpbb_lang_path . "lang_" . $this->get_phpbb_lang($userdata['user_lang']) . "/lang_main.$phpEx")) ? $this->get_phpbb_lang($userdata['user_lang']) : $board_config['default_lang'];
  				$this->lang_path = $phpbb_lang_path . "lang_" . $this->lang_name . '/';
  			}

[mxbb-commits] core/includes mx_functions_phpbb.php, 1.70, 1.71 mx_functions_style.php, 1.75, 1.76

[FlorinCB <ory...@us...>]

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

Modified Files:
	mx_functions_phpbb.php mx_functions_style.php 
Log Message:
get_old_lang -> get_phpbb_lang

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** mx_functions_style.php	26 Jun 2008 22:02:00 -0000	1.75
--- mx_functions_style.php	9 Jul 2008 14:53:55 -0000	1.76
***************
*** 561,567 ****
  		//
  		// Now, $this->lang['default_lang'] is populated. But do we have a mathing MX-Publisher lang file?
! 		// Note: $this->get_old_lang() is used to translate phpBB3 lang keys/paths to old ways, eg to ensure lang_english and not lang_en.
  		//
! 		if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_old_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) )
  		{
  			if ( $this->data['user_id'] != ANONYMOUS || $this->data['user_id'] != 1 )
--- 561,567 ----
  		//
  		// Now, $this->lang['default_lang'] is populated. But do we have a mathing MX-Publisher lang file?
! 		// Note: $this->get_phpbb_lang() is used to translate phpBB3 lang keys/paths to old ways, eg to ensure lang_english and not lang_en.
  		//
! 		if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) )
  		{
  			if ( $this->data['user_id'] != ANONYMOUS || $this->data['user_id'] != 1 )
***************
*** 575,585 ****
  				// This is a long shot since it means serious errors in the setup to reach here,
  				// but english is part of a new install so it's worth us trying
! 				//$this->lang['default_lang'] = $this->get_old_lang('en'); //this will not work with sessions
  				$this->lang['default_lang'] = 'en';
  			}
  
! 			if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_old_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) )
  			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->get_old_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx);
  			}
  		}
--- 575,585 ----
  				// This is a long shot since it means serious errors in the setup to reach here,
  				// but english is part of a new install so it's worth us trying
! 				//$this->lang['default_lang'] = $this->get_phpbb_lang('en'); //this will not work with sessions
  				$this->lang['default_lang'] = 'en';
  			}
  
! 			if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) )
  			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->get_phpbb_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx);
  			}
  		}
***************
*** 613,617 ****
  
  		$board_config['phpbb_lang'] = $this->lang['default_lang'];
! 		$board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // This will expand the lang name
  
  		switch (PORTAL_BACKEND)
--- 613,617 ----
  
  		$board_config['phpbb_lang'] = $this->lang['default_lang'];
! 		$board_config['default_lang'] = $this->get_phpbb_lang($this->lang['default_lang']); // This will expand the lang name
  
  		switch (PORTAL_BACKEND)
***************
*** 1143,1147 ****
  		else
  		{
! 			$img_lang = ($this->lang['default_lang']) ? $this->get_old_lang($this->lang['default_lang']) : (($board_config['default_lang']) ? $board_config['default_lang'] : 'english');
  		}
  
--- 1143,1147 ----
  		else
  		{
! 			$img_lang = ($this->lang['default_lang']) ? $this->get_phpbb_lang($this->lang['default_lang']) : (($board_config['default_lang']) ? $board_config['default_lang'] : 'english');
  		}
  
***************
*** 1274,1278 ****
  		global $lang, $board_config, $mx_block, $phpEx, $mx_root_path;
  
! 		$default_lang = ($this->lang['default_lang']) ? $this->get_old_lang($this->lang['default_lang']) : $board_config['default_lang'];
  
  		if (empty($default_lang))
--- 1274,1278 ----
  		global $lang, $board_config, $mx_block, $phpEx, $mx_root_path;
  
! 		$default_lang = ($this->lang['default_lang']) ? $this->get_phpbb_lang($this->lang['default_lang']) : $board_config['default_lang'];
  
  		if (empty($default_lang))
***************
*** 1344,1349 ****
  	}
  
! 	// USE: $default_lang = $mx_user->get_old_lang($board_config['default_lang']);
! 	function get_old_lang($lang)
  	{
  		if ( PORTAL_BACKEND != 'phpbb3' )
--- 1344,1349 ----
  	}
  
! 	// USE: $default_lang = $mx_user->get_phpbb_lang($board_config['default_lang']);
! 	function get_phpbb_lang($lang)
  	{
  		if ( PORTAL_BACKEND != 'phpbb3' )

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** mx_functions_phpbb.php	8 Jul 2008 22:01:34 -0000	1.70
--- mx_functions_phpbb.php	9 Jul 2008 14:53:55 -0000	1.71
***************
*** 261,265 ****
  	}
  
! 	//$default_lang = $mx_user->get_old_lang($board_config['default_lang']);
  	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang'];
  
--- 261,265 ----
  	}
  
! 	//$default_lang = $mx_user->get_phpbb_lang($board_config['default_lang']);
  	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang'];
  
***************
*** 402,406 ****
  	$mx_page->init( $page_id );
  
! 	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
  
  	if ( empty($default_lang) )
--- 402,406 ----
  	$mx_page->init( $page_id );
  
! 	$default_lang = ($mx_user->lang['default_lang']) ? $mx_user->get_phpbb_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
  
  	if ( empty($default_lang) )

[mxbb-commits] mx_simpledoc/templates/_core simpledoc_index.tpl, 1.3, 1.4 simpledoc_view.tpl, 1.2, 1.3

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_simpledoc/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13359

Modified Files:
	simpledoc_index.tpl simpledoc_view.tpl 
Log Message:
Still updating/debugging generic core comments

Index: simpledoc_index.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/templates/_core/simpledoc_index.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** simpledoc_index.tpl	21 May 2008 21:59:24 -0000	1.3
--- simpledoc_index.tpl	8 Jul 2008 22:10:39 -0000	1.4
***************
*** 366,370 ****
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="rowxx">
  		<table cellspacing="0" cellpadding="0" width="100%">
  			<tr>
--- 366,370 ----
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="row1">
  		<table cellspacing="0" cellpadding="0" width="100%">
  			<tr>
***************
*** 385,396 ****
  					            </div>
  					        </td>
- 					        <!--
- 					        <td>
- 					            <a class="button" href="javascript:void(0)">{L_OPTIONS}</a>
- 					            <div class="section">
- 					                <a class="item" href="{MODE_SETTINGS_URL}">{L_SETTINGS}</a>
- 					            </div>
- 					        </td>
- 					        -->
  					        <td>
  					            <a class="button" href="javascript:void(0)">{L_HELP}</a>
--- 385,388 ----

Index: simpledoc_view.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_simpledoc/templates/_core/simpledoc_view.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simpledoc_view.tpl	21 May 2008 21:59:24 -0000	1.2
--- simpledoc_view.tpl	8 Jul 2008 22:10:39 -0000	1.3
***************
*** 272,281 ****
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="rowxx">
! 		<table cellspacing="0" cellpadding="0" width="100%"><tr>
  			<td class="rowxx">
  				<table cellspacing="0" cellpadding="0" width="100%">
  					<tr>
- 					<tr>
  					    <td id="top" class="simpledoc_title">
  					        <span class="nomargin">{L_PROJECT_NAME} {MANAGE}</span>
--- 272,281 ----
  <table cellspacing="1" cellpadding="0" width="100%" height="100%" class="forumline" style="border-top:none;">
  <tr>
! 	<td class="row1">
! 		<table cellspacing="0" cellpadding="0" width="100%">
! 		<tr>
  			<td class="rowxx">
  				<table cellspacing="0" cellpadding="0" width="100%">
  					<tr>
  					    <td id="top" class="simpledoc_title">
  					        <span class="nomargin">{L_PROJECT_NAME} {MANAGE}</span>