mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

Changes for styling directory layout alterations

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4325 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-07-24 13:58:59 +00:00
parent be3b51ae84
commit 275f62a5bd
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/functions.php
View File

@ -1347,18 +1347,18 @@ function page_header($page_title = '')
'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0, 'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0,
'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0, 'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0,
'T_THEME_PATH' => 'styles/themes/' . $user->theme['primary']['theme_path'], 'T_THEME_PATH' => 'styles/' . $user->theme['primary']['theme_path'] . '/theme/',
'T_STYLESHEET_LINK' => (!$user->theme['primary']['css_storedb']) ? 'styles/themes/' . $user->theme['primary']['theme_path'] . '/' . $user->theme['primary']['theme_name'] . '.css' : '', 'T_STYLESHEET_LINK' => (!$user->theme['primary']['css_storedb']) ? 'styles/' . $user->theme['primary']['theme_path'] . '/theme/stylesheet.css' : "style.$phpEx?sid=$user->session_id&id=" . $user->theme['primary']['theme_id'],
'T_THEME_DATA' => (!$user->theme['primary']['css_storedb']) ? '' : $user->theme['primary']['css_data']) 'T_THEME_DATA' => (!$user->theme['primary']['css_storedb']) ? '' : $user->theme['primary']['css_data'])
); );
if (!empty($config['send_encoding'])) if (!empty($config['send_encoding']))
{ {
header ('Content-type: text/html; charset: ' . $user->lang['ENCODING']); header('Content-type: text/html; charset: ' . $user->lang['ENCODING']);
} }
header ('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0'); header('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0');
header ('Expires: 0'); header('Expires: 0');
header ('Pragma: no-cache'); header('Pragma: no-cache');
return; return;
} }

2
phpBB/includes/session.php
View File

@ -498,7 +498,7 @@ class user extends session
$template->set_template(); $template->set_template();
$this->img_lang = (file_exists($phpbb_root_path . 'styles/imagesets/' . $this->theme['default']['imageset_path'] . '/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['default']['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang'];
return; return;
} }

8
phpBB/includes/template.php
View File

@ -68,16 +68,16 @@ class template
{ {
global $phpbb_root_path, $config, $user; global $phpbb_root_path, $config, $user;
if (file_exists($phpbb_root_path . 'styles/templates/' . $user->theme['primary']['template_path'])) if (file_exists($phpbb_root_path . 'styles/' . $user->theme['primary']['template_path'] . '/template'))
{ {
// $this->tpl = 'primary'; // $this->tpl = 'primary';
$this->root = $phpbb_root_path . 'styles/templates/' . $user->theme['primary']['template_path']; $this->root = $phpbb_root_path . 'styles/' . $user->theme['primary']['template_path']. '/template';
$this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['primary']['template_path'] . '_'; $this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['primary']['template_path'] . '_';
} }
else else
{ {
// $this->tpl = 'secondary'; // $this->tpl = 'secondary';
$this->root = $phpbb_root_path . 'styles/templates/' . $user->theme['secondary']['template_path']; $this->root = $phpbb_root_path . 'styles/' . $user->theme['secondary']['template_path']. '/template';
$this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['secondary']['template_path'] . '_'; $this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['secondary']['template_path'] . '_';
} }
@ -166,7 +166,7 @@ class template
if (!file_exists($this->files[$handle])) if (!file_exists($this->files[$handle]))
{ {
// $this->tpl = 'secondary'; // $this->tpl = 'secondary';
$this->files[$handle] = $phpbb_root_path . 'styles/templates/' . $user->theme['secondary']['template_path'] . '/' . $this->filename[$handle]; $this->files[$handle] = $phpbb_root_path . 'styles/' . $user->theme['secondary']['template_path'] . '/template/' . $this->filename[$handle];
} }
$str = ''; $str = '';