diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-10 15:14:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-10 15:14:25 +0000 |
| commit | 2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1 (patch) | |
| tree | 20cc92d3b1136876bccb7548dda2c27c223d23c8 /phpBB/includes | |
| parent | f538d70301a38cd65ca9d2463db0420c5eb1f3e0 (diff) | |
| download | forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar.gz forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar.bz2 forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.tar.xz forums-2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1.zip | |
some fixes here and there
git-svn-id: file:///svn/phpbb/trunk@7860 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index def15c67c7..f9c0a6308e 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -394,7 +394,7 @@ class jabber } // go on with authentication? - if (isset($this->features['stream:features'][0]['#']['bind']) || $this->session['tls']) + if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls'])) { return $this->response($this->features); } diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index c3190cdee8..bc968c5e1b 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -757,7 +757,7 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data) $hidden .= '<input type="hidden" name="attachment_data[' . $count . '][' . $key . ']" value="' . $value . '" />'; } - $download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], false, ($attach_row['is_orphan']) ? $user->session_id : false); + $download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $user->session_id : false); $template->assign_block_vars('attach_row', array( 'FILENAME' => basename($attach_row['real_filename']), diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 495fdcee48..8a9021b573 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -132,7 +132,7 @@ class session */ function session_begin($update_session_page = true) { - global $phpEx, $SID, $_SID, $db, $config, $phpbb_root_path; + global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path; // Give us some basic information $this->time_now = time(); @@ -193,6 +193,8 @@ class session $SID = '?sid=' . $this->session_id; } + $_EXTRA_URL = array(); + // Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests // it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip. $this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : ''; |