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

- some changes to browser checking (was the reason for not working logins)

Browse Source 
- partly working style acp
- other tiny changes here and there


git-svn-id: file:///svn/phpbb/trunk@5388 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2005-12-28 17:35:20 +00:00
parent 761598e1b7
commit 0334d42477
20 changed files with 1862 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_language.php
View File

@@ -642,7 +642,7 @@ class acp_language
if (!in_array($use_method, $methods))
{
$use_method = '';
$use_method = 'tar';
}
// Let the user decide in which format he wants to have the pack

4
phpBB/includes/acp/acp_modules.php
View File

@@ -44,6 +44,10 @@ class acp_modules
{
$user->add_lang('ucp');
}
else if ($this->module_class == 'mcp')
{
$user->add_lang('mcp');
}
$this->page_title = strtoupper($this->module_class);

1140
phpBB/includes/acp/acp_styles.php Normal file
View File

File diff suppressed because it is too large Load Diff

2
phpBB/includes/db/dbal.php
View File

@@ -255,7 +255,7 @@ class dbal
$totaltime = $mtime[0] + $mtime[1] - $starttime;
echo '
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css">
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/style/sql_report.css" type="text/css">
<style type="text/css"> th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') } td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') } </style>
<title>Explain</title></head><body>
<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr>

7
phpBB/includes/functions.php
View File

@@ -1481,11 +1481,14 @@ function build_hidden_fields($field_ary)
/**
* Parse cfg file
*/
function parse_cfg_file($filename)
function parse_cfg_file($filename, $lines = false)
{
$parsed_items = array();
$lines = file($filename);
if ($lines === false)
{
$lines = file($filename);
}
foreach ($lines as $line)
{

1
phpBB/includes/functions_template.php
View File

@@ -193,7 +193,6 @@ class template_compile
for ($i = 0, $size = sizeof($text_blocks); $i < $size; $i++)
{
$trim_check_text = trim($text_blocks[$i]);
$trim_check_block = trim($compile_blocks[$i]);
$template_php .= (!$no_echo) ? ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '') : ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '');
}

17
phpBB/includes/functions_transfer.php
View File

@@ -55,7 +55,7 @@ class transfer
// temporary files or have write access on a folder within phpBB
// like the cache folder. If the user can't do either, then
// he/she needs to use the fsock ftp method
$temp_name = tempnam($this->tmp_path, 'ftp_');
$temp_name = tempnam($this->tmp_path, 'transfer_');
@unlink($temp_name);
$fp = @fopen($temp_name, 'w');
@@ -183,6 +183,21 @@ class transfer
{
return $this->_close();
}
/**
* Determine methods able to be used
*/
function methods()
{
$methods = array();
if (@extension_loaded('ftp'))
{
$methods[] = 'ftp';
}
return $methods;
}
}
/**

7
phpBB/includes/session.php
View File

@@ -105,8 +105,8 @@ class session
$s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check']));
$u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check']));
$s_browser = ($config['browser_check']) ? $this->data['session_browser'] : '';
$u_browser = ($config['browser_check']) ? $this->browser : '';
$s_browser = ($config['browser_check']) ? substr($this->data['session_browser'], 0, 149) : '';
$u_browser = ($config['browser_check']) ? substr($this->browser, 0, 149) : '';
if ($u_ip == $s_ip && $s_browser == $u_browser)
{
@@ -312,6 +312,7 @@ class session
$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE session_id = '" . $db->sql_escape($this->session_id) . "'";
if (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows())
{
// Limit new sessions in 1 minute period (if required)
@@ -666,7 +667,7 @@ class session
);
}
$sql = ($key) ? 'UPDATE ' . SESSIONS_KEYS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . (int) $user_id . ' AND key_id = "' . $db->sql_escape($key) . '"' : 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
$sql = ($key) ? 'UPDATE ' . SESSIONS_KEYS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . (int) $user_id . ' AND key_id = "' . $db->sql_escape(md5($key)) . '"' : 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
$db->sql_query($sql);
$this->cookie_data['k'] = $key_id;