mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- moved add_log out of functions_admin (this file should only be included in admin/admin-related pages)

Browse Source 
- fixed cookie based topic tracking
- added missing config variables
- other minor things


git-svn-id: file:///svn/phpbb/trunk@5494 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-01-25 21:01:52 +00:00
parent 964615eb07
commit 90385cd79a
18 changed files with 161 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/includes/session.php
View File

@@ -45,7 +45,22 @@ class session
$this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : '';
$this->page = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] . ((isset($_POST['f'])) ? 'f=' . intval($_POST['f']) : '') : '';
$sid = substr($this->page, strpos($this->page, 'sid='), 36);
$this->page = str_replace(array('/' . $config['script_path'] . '/', (strlen($sid) == 36 && strpos($sid, '&') === false) ? $sid : 'sid='), '', $this->page);
/**
* @todo: getting away with script_path or being more strict in it's format
*/
$script_path = $config['script_path'];
if ($script_path{0} != '/')
{
$script_path = '/' . $script_path;
}
if ($script_path{(strlen($script_path)-1)} != '/')
{
$script_path .= '/';
}
$this->page = str_replace(array($script_path, (strlen($sid) == 36 && strpos($sid, '&') === false) ? $sid : 'sid='), '', $this->page);
$this->cookie_data = array();
if (isset($_COOKIE[$config['cookie_name'] . '_sid']) || isset($_COOKIE[$config['cookie_name'] . '_u']))
@@ -930,6 +945,14 @@ class user extends session
{
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/' . $config['default_lang'] . '/';
}
// $lang == $this->lang
// $help == $this->help
// - add appropiate variables here, name them as they are used within the language file...