[mxbb-commits] core/includes/sessions/phpbb3 session.php,1.4,1.5

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

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

Modified Files:
	session.php 
Log Message:
phpbb3 acp stuff

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** session.php	13 Jan 2008 12:09:01 -0000	1.4
--- session.php	15 Jan 2008 22:26:48 -0000	1.5
***************
*** 41,44 ****
--- 41,57 ----
  	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_id = false;
+ 	var $lang_path;
+ 	var $img_lang;
+ 	var $img_array = array();
+ 
  	/**
  	* Extract current session page
***************
*** 1266,1285 ****
  		}
  
- 		//mxBB
- 		//To do
- 		// We include acp language file here to not load it every time a custom language file is included
- 		/*
- 		if (defined('IN_ADMIN'))
- 		{
- 			if ((include $this->lang_path . "acp/common.$phpEx") === false)
- 			{
- 				//this will fix the path for anonymouse users
- 				if ((include $phpbb_root_path . $this->lang_path . "acp/common.$phpEx") === false)
- 				{
- 					die('Language file ' . $phpbb_root_path . $this->lang_path . "acp/common.$phpEx" . " couldn't be opened.");
- 				}
- 			}
- 		}*/
- 
  		$this->add_lang($lang_set);
  		unset($lang_set);
--- 1279,1282 ----
***************
*** 1578,1582 ****
  			}
  		}
- 
  		return;
  	}
--- 1575,1578 ----
***************
*** 1627,1633 ****
  				}
  			}
! 			unset($lang_set);
  		}
! 		else if ($lang_set)
  		{
  			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
--- 1623,1629 ----
  				}
  			}
! 			//unset($lang_set);
  		}
! 		elseif ($lang_set)
  		{
  			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
***************
*** 1684,1687 ****
--- 1680,1686 ----
  	{
  		static $midnight;
+ 		global $lang;
+ 
+ 		$this->lang = $lang;
  
  		$lang_dates = $this->lang['datetime'];
***************
*** 1825,1827 ****
--- 1824,2516 ----
  }
  
+ 
+ 
+ /**
+ * Base user class
+ *
+ * This is the overarching class which contains (through session extend)
+ * all methods utilised for user functionality during a session.
+ *
+ * @package phpBB3
+ */
+ class user extends session
+ {
+ 	var $lang = array();
+ 	var $help = array();
+ 	var $theme = array();
+ 	var $date_format;
+ 	var $timezone;
+ 	var $dst;
+ 
+ 	var $lang_name;
+ 	var $lang_id = false;
+ 	var $lang_path;
+ 	var $img_lang;
+ 	var $img_array = array();
+ 
+ 	// Able to add new option (id 7)
+ 	var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10);
+ 	var $keyvalues = array();
+ 
+ 	/**
+ 	* Setup basic user-specific items (style, language, ...)
+ 	*/
+ 	function setup($lang_set = false, $style = false)
+ 	{
+ 		global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
+ 
+ 		if ($this->data['user_id'] != ANONYMOUS)
+ 		{
+ 			$this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
+ 			$this->lang_path = $phpbb_root_path . 'language/' . $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 = basename($config['default_lang']);
+ 			$this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/';
+ 			$this->date_format = $config['default_dateformat'];
+ 			$this->timezone = $config['board_timezone'] * 3600;
+ 			$this->dst = $config['board_dst'] * 3600;
+ 
+ 			/**
+ 			* If a guest user is surfing, we try to guess his/her language first by obtaining the browser language
+ 			* If re-enabled we need to make sure only those languages installed are checked
+ 			* Commented out so we do not loose the code.
+ 
+ 			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+ 			{
+ 				$accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+ 
+ 				foreach ($accept_lang_ary as $accept_lang)
+ 				{
+ 					// Set correct format ... guess full xx_YY form
+ 					$accept_lang = substr($accept_lang, 0, 2) . '_' . strtoupper(substr($accept_lang, 3, 2));
+ 					$accept_lang = basename($accept_lang);
+ 
+ 					if (file_exists($phpbb_root_path . 'language/' . $accept_lang . "/common.$phpEx"))
+ 					{
+ 						$this->lang_name = $config['default_lang'] = $accept_lang;
+ 						$this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/';
+ 						break;
+ 					}
+ 					else
+ 					{
+ 						// No match on xx_YY so try xx
+ 						$accept_lang = substr($accept_lang, 0, 2);
+ 						$accept_lang = basename($accept_lang);
+ 
+ 						if (file_exists($phpbb_root_path . 'language/' . $accept_lang . "/common.$phpEx"))
+ 						{
+ 							$this->lang_name = $config['default_lang'] = $accept_lang;
+ 							$this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/';
+ 							break;
+ 						}
+ 					}
+ 				}
+ 			}
+ 			*/
+ 		}
+ 
+ 		// We include common language file here to not load it every time a custom language file is included
+ 		$lang = &$this->lang;
+ 
+ 		if ((@include $this->lang_path . "common.$phpEx") === false)
+ 		{
+ 			die('Language file ' . $this->lang_name . "/common.$phpEx" . " couldn't be opened.");
+ 		}
+ 
+ 		$this->add_lang($lang_set);
+ 		unset($lang_set);
+ 
+ 		if (!empty($_GET['style']) && $auth->acl_get('a_styles'))
+ 		{
+ 			global $SID, $_EXTRA_URL;
+ 
+ 			$style = request_var('style', 0);
+ 			$SID .= '&style=' . $style;
+ 			$_EXTRA_URL = array('style=' . $style);
+ 		}
+ 		else
+ 		{
+ 			// Set up style
+ 			$style = ($style) ? $style : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']);
+ 		}
+ 
+ 		$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);
+ 
+ 		// User has wrong style
+ 		if (!$this->theme && $style == $this->data['user_style'])
+ 		{
+ 			$style = $this->data['user_style'] = $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 = $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 : $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 = 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');
+ 				$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
+ 
+ 				add_log('admin', 'LOG_IMAGESET_LANG_REFRESHED', $this->theme['imageset_name'], $this->img_lang);
+ 			}
+ 			else
+ 			{
+ 				$db->sql_transaction('commit');
+ 				add_log('admin', 'LOG_IMAGESET_LANG_MISSING', $this->theme['imageset_name'], $this->img_lang);
+ 			}
+ 		}
+ 
+ 		// Call phpbb_user_session_handler() in case external application want to "bend" some variables or replace classes...
+ 		// After calling it we continue script execution...
+ 		phpbb_user_session_handler();
+ 
+ 		// 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 ($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))
+ 			{
+ 				$message = 'REMOVE_INSTALL';
+ 			}
+ 			else
+ 			{
+ 				$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
+ 			}
+ 			trigger_error($message);
+ 		}
+ 
+ 		// Is board disabled and user not an admin or moderator?
+ 		if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))
+ 		{
+ 			header('HTTP/1.1 503 Service Unavailable');
+ 
+ 			$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
+ 			trigger_error($message);
+ 		}
+ 
+ 		// Is load exceeded?
+ 		if ($config['limit_load'] && $this->load !== false)
+ 		{
+ 			if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN'))
+ 			{
+ 				// Set board disabled to true to let the admins/mods get the proper notification
+ 				$config['board_disable'] = '1';
+ 
+ 				if (!$auth->acl_gets('a_', 'm_') && !$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 (!$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 ($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') && $config['chg_passforce'] && $this->data['is_registered'] && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
+ 		{
+ 			if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
+ 			{
+ 				redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=reg_details'));
+ 			}
+ 		}
+ 
+ 		return;
+ 	}
+ 
+ 	/**
+ 	* Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion)
+ 	*
+ 	* @param mixed $lang_set specifies the language entries to include
+ 	* @param bool $use_db internal variable for recursion, do not use
+ 	* @param bool $use_help internal variable for recursion, do not use
+ 	*
+ 	* Examples:
+ 	* <code>
+ 	* $lang_set = array('posting', 'help' => 'faq');
+ 	* $lang_set = array('posting', 'viewtopic', 'help' => array('bbcode', 'faq'))
+ 	* $lang_set = array(array('posting', 'viewtopic'), 'help' => array('bbcode', 'faq'))
+ 	* $lang_set = 'posting'
+ 	* $lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting'))
+ 	* </code>
+ 	*/
+ 	function add_lang($lang_set, $use_db = false, $use_help = false)
+ 	{
+ 		global $phpEx;
+ 
+ 		if (is_array($lang_set))
+ 		{
+ 			foreach ($lang_set as $key => $lang_file)
+ 			{
+ 				// Please do not delete this line.
+ 				// We have to force the type here, else [array] language inclusion will not work
+ 				$key = (string) $key;
+ 
+ 				if ($key == 'db')
+ 				{
+ 					$this->add_lang($lang_file, true, $use_help);
+ 				}
+ 				else if ($key == 'help')
+ 				{
+ 					$this->add_lang($lang_file, $use_db, true);
+ 				}
+ 				else if (!is_array($lang_file))
+ 				{
+ 					$this->set_lang($this->lang, $this->help, $lang_file, $use_db, $use_help);
+ 				}
+ 				else
+ 				{
+ 					$this->add_lang($lang_file, $use_db, $use_help);
+ 				}
+ 			}
+ 			unset($lang_set);
+ 		}
+ 		else if ($lang_set)
+ 		{
+ 			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
+ 		}
+ 	}
+ 
+ 	/**
+ 	* Set language entry (called by add_lang)
+ 	* @access private
+ 	*/
+ 	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
+ 	{
+ 		global $phpEx;
+ 
+ 		// Make sure the language path is set (if the user setup did not happen it is not set)
+ 		if (!$this->lang_path)
+ 		{
+ 			global $phpbb_root_path, $config;
+ 
+ 			$this->lang_path = $phpbb_root_path . 'language/' . basename($config['default_lang']) . '/';
+ 		}
+ 
+ 		// $lang == $this->lang
+ 		// $help == $this->help
+ 		// - add appropriate variables here, name them as they are used within the language file...
+ 		if (!$use_db)
+ 		{
+ 			if ($use_help && strpos($lang_file, '/') !== false)
+ 			{
+ 				$language_filename = $this->lang_path . substr($lang_file, 0, stripos($lang_file, '/') + 1) . 'help_' . substr($lang_file, stripos($lang_file, '/') + 1) . '.' . $phpEx;
+ 			}
+ 			else
+ 			{
+ 				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
+ 			}
+ 
+ 			if ((@include $language_filename) === false)
+ 			{
+ 				trigger_error('Language file ' . basename($language_filename) . ' couldn\'t be opened.', E_USER_ERROR);
+ 			}
+ 		}
+ 		else if ($use_db)
+ 		{
+ 			// Get Database Language Strings
+ 			// Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed
+ 			// For example: help:faq, posting
+ 		}
+ 	}
+ 
+ 	/**
+ 	* Format user date
+ 	*/
+ 	function format_date($gmepoch, $format = false, $forcedate = false)
+ 	{
+ 		static $midnight;
+ 
+ 		$lang_dates = $this->lang['datetime'];
+ 		$format = (!$format) ? $this->date_format : $format;
+ 
+ 		// Short representation of month in format
+ 		if ((strpos($format, '\M') === false && strpos($format, 'M') !== false) || (strpos($format, '\r') === false && strpos($format, 'r') !== false))
+ 		{
+ 			$lang_dates['May'] = $lang_dates['May_short'];
+ 		}
+ 
+ 		unset($lang_dates['May_short']);
+ 
+ 		if (!$midnight)
+ 		{
+ 			list($d, $m, $y) = explode(' ', gmdate('j n Y', time() + $this->timezone + $this->dst));
+ 			$midnight = gmmktime(0, 0, 0, $m, $d, $y) - $this->timezone - $this->dst;
+ 		}
+ 
+ 		if (strpos($format, '|') === false || ($gmepoch < $midnight - 86400 && !$forcedate) || ($gmepoch > $midnight + 172800 && !$forcedate))
+ 		{
+ 			return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates);
+ 		}
+ 
+ 		if ($gmepoch > $midnight + 86400 && !$forcedate)
+ 		{
+ 			$format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1);
+ 			return str_replace('||', $this->lang['datetime']['TOMORROW'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates));
+ 		}
+ 		else if ($gmepoch > $midnight && !$forcedate)
+ 		{
+ 			$format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1);
+ 			return str_replace('||', $this->lang['datetime']['TODAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates));
+ 		}
+ 		else if ($gmepoch > $midnight - 86400 && !$forcedate)
+ 		{
+ 			$format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1);
+ 			return str_replace('||', $this->lang['datetime']['YESTERDAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates));
+ 		}
+ 
+ 		return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates);
+ 	}
+ 
+ 	/**
+ 	* Get language id currently used by the user
+ 	*/
+ 	function get_iso_lang_id()
+ 	{
+ 		global $config, $db;
+ 
+ 		if (!empty($this->lang_id))
+ 		{
+ 			return $this->lang_id;
+ 		}
+ 
+ 		if (!$this->lang_name)
+ 		{
+ 			$this->lang_name = $config['default_lang'];
+ 		}
+ 
+ 		$sql = 'SELECT lang_id
+ 			FROM ' . LANG_TABLE . "
+ 			WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'";
+ 		$result = $db->sql_query($sql);
+ 		$this->lang_id = (int) $db->sql_fetchfield('lang_id');
+ 		$db->sql_freeresult($result);
+ 
+ 		return $this->lang_id;
+ 	}
+ 
+ 	/**
+ 	* Get users profile fields
+ 	*/
+ 	function get_profile_fields($user_id)
+ 	{
+ 		global $db;
+ 
+ 		if (isset($this->profile_fields))
+ 		{
+ 			return;
+ 		}
+ 
+ 		$sql = 'SELECT *
+ 			FROM ' . PROFILE_FIELDS_DATA_TABLE . "
+ 			WHERE user_id = $user_id";
+ 		$result = $db->sql_query_limit($sql, 1);
+ 		$this->profile_fields = (!($row = $db->sql_fetchrow($result))) ? array() : $row;
+ 		$db->sql_freeresult($result);
+ 	}
+ 
+ 	/**
+ 	* Specify/Get image
+ 	*/
+ 	function img($img, $alt = '', $width = false, $suffix = '', $type = 'full_tag')
+ 	{
+ 		static $imgs;
+ 		global $phpbb_root_path;
+ 
+ 		$img_data = &$imgs[$img];
+ 
+ 		if (empty($img_data))
+ 		{
+ 			if (!isset($this->img_array[$img]))
+ 			{
+ 				// Do not fill the image to let designers decide what to do if the image is empty
+ 				$img_data = '';
+ 				return $img_data;
+ 			}
+ 
+ 			$img_data['src'] = $phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
+ 			$img_data['width'] = $this->img_array[$img]['image_width'];
+ 			$img_data['height'] = $this->img_array[$img]['image_height'];
+ 		}
+ 
+ 		$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt;
+ 
+ 		switch ($type)
+ 		{
+ 			case 'src':
+ 				return $img_data['src'];
+ 			break;
+ 
+ 			case 'width':
+ 				return ($width === false) ? $img_data['width'] : $width;
+ 			break;
+ 
+ 			case 'height':
+ 				return $img_data['height'];
+ 			break;
+ 
+ 			default:
+ 				$use_width = ($width === false) ? $img_data['width'] : $width;
+ 
+ 				return '<img src="' . $img_data['src'] . '"' . (($use_width) ? ' width="' . $use_width . '"' : '') . (($img_data['height']) ? ' height="' . $img_data['height'] . '"' : '') . ' alt="' . $alt . '" title="' . $alt . '" />';
+ 			break;
+ 		}
+ 	}
+ 
+ 	/**
+ 	* Get option bit field from user options
+ 	*/
+ 	function optionget($key, $data = false)
+ 	{
+ 		if (!isset($this->keyvalues[$key]))
+ 		{
+ 			$var = ($data) ? $data : $this->data['user_options'];
+ 			$this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false;
+ 		}
+ 
+ 		return $this->keyvalues[$key];
+ 	}
+ 
+ 	/**
+ 	* Set option bit field for user options
+ 	*/
+ 	function optionset($key, $value, $data = false)
+ 	{
+ 		$var = ($data) ? $data : $this->data['user_options'];
+ 
+ 		if ($value && !($var & 1 << $this->keyoptions[$key]))
+ 		{
+ 			$var += 1 << $this->keyoptions[$key];
+ 		}
+ 		else if (!$value && ($var & 1 << $this->keyoptions[$key]))
+ 		{
+ 			$var -= 1 << $this->keyoptions[$key];
+ 		}
+ 		else
+ 		{
+ 			return ($data) ? $var : false;
+ 		}
+ 
+ 		if (!$data)
+ 		{
+ 			$this->data['user_options'] = $var;
+ 			return true;
+ 		}
+ 		else
+ 		{
+ 			return $var;
+ 		}
+ 	}
+ }
+ 
+ 
  ?>
\ No newline at end of file