[Customisation Database Commits] r264 [4/4] - in /trunk: titania/ titania/includes/ titania/styles/default/template/ titania/styles/default/theme/ titania/styles/default/theme/images/ titania/styles/default/theme/js/ umil/
David Lewis
highwayoflife at phpbb.com
Sat Jun 27 06:05:14 UTC 2009
Propchange: trunk/titania/styles/default/theme/js/jquery-ui-1.7.2.custom.min.js
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: trunk/titania/styles/default/theme/js/jquery-ui-1.7.2.custom.min.js
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/umil/file.php
==============================================================================
*** trunk/umil/file.php (original)
--- trunk/umil/file.php Sat Jun 27 06:05:14 2009
***************
*** 14,20 ****
* @ignore
*/
define('IN_PHPBB', true);
! $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : '../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx);
--- 14,21 ----
* @ignore
*/
define('IN_PHPBB', true);
! $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../community/';
! $umil_root_path = (defined('UMIL_ROOT_PATH')) ? UMIL_ROOT_PATH : './';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx);
***************
*** 24,30 ****
$user->setup('viewtopic');
$file = request_var('file', '');
! $filename = $phpbb_root_path . 'umil/error_files/' . $file . '.txt';
if ($user->data['user_type'] != USER_FOUNDER || // Only founders can access this.
!$file || // Do we have a file name?
--- 25,31 ----
$user->setup('viewtopic');
$file = request_var('file', '');
! $filename = $umil_root_path . 'error_files/' . $file . '.txt';
if ($user->data['user_type'] != USER_FOUNDER || // Only founders can access this.
!$file || // Do we have a file name?
Modified: trunk/umil/umil.php
==============================================================================
*** trunk/umil/umil.php (original)
--- trunk/umil/umil.php Sat Jun 27 06:05:14 2009
***************
*** 170,184 ****
else
{*/
// Include the umil language file. First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
! if (isset($user->data['user_lang']) && file_exists("{$phpbb_root_path}umil/language/{$user->data['user_lang']}/umil.$phpEx"))
{
$path = $user->data['user_lang'];
}
! else if (file_exists("{$phpbb_root_path}umil/language/" . basename($config['default_lang']) . "/umil.$phpEx"))
{
$path = basename($config['default_lang']);
}
! else if (file_exists("{$phpbb_root_path}umil/language/en/umil.$phpEx"))
{
$path = 'en';
}
--- 170,184 ----
else
{*/
// Include the umil language file. First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
! if (isset($user->data['user_lang']) && file_exists(UMIL_ROOT_PATH . "language/{$user->data['user_lang']}/umil." . PHP_EXT))
{
$path = $user->data['user_lang'];
}
! else if (file_exists(UMIL_ROOT_PATH . 'language/' . basename($config['default_lang']) . '/umil.' . PHP_EXT))
{
$path = basename($config['default_lang']);
}
! else if (file_exists(UMIL_ROOT_PATH . 'language/en/umil.' . PHP_EXT))
{
$path = 'en';
}
***************
*** 187,193 ****
trigger_error('Language Files Missing.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
! $user->add_lang('./../../umil/language/' . $path . '/umil');
//}
$user->add_lang(array('acp/common', 'acp/permissions'));
--- 187,193 ----
trigger_error('Language Files Missing.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
! $user->add_lang('../../' . UMIL_ROOT_PATH . 'language/' . $path . '/umil');
//}
$user->add_lang(array('acp/common', 'acp/permissions'));
Modified: trunk/umil/umil_auto.php
==============================================================================
*** trunk/umil/umil_auto.php (original)
--- trunk/umil/umil_auto.php Sat Jun 27 06:05:14 2009
***************
*** 46,52 ****
if (!defined('IN_PHPBB'))
{
define('IN_PHPBB', true);
! include($phpbb_root_path . 'common.' . $phpEx);
$user->session_begin();
$auth->acl($user->data);
$user->setup();
--- 46,52 ----
if (!defined('IN_PHPBB'))
{
define('IN_PHPBB', true);
! include PHPBB_ROOT_PATH . 'common.' . PHP_EXT;
$user->session_begin();
$auth->acl($user->data);
$user->setup();
***************
*** 76,87 ****
if (!class_exists('umil_frontend'))
{
! if (!file_exists($phpbb_root_path . 'umil/umil_frontend.' . $phpEx))
{
trigger_error('Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
! include($phpbb_root_path . 'umil/umil_frontend.' . $phpEx);
}
$force_display_results = request_var('display_results', (defined('DEBUG') ? true : false));
--- 76,87 ----
if (!class_exists('umil_frontend'))
{
! if (!file_exists(UMIL_ROOT_PATH . 'umil_frontend.' . PHP_EXT))
{
trigger_error('Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
! include UMIL_ROOT_PATH . 'umil_frontend.' . PHP_EXT;
}
$force_display_results = request_var('display_results', (defined('DEBUG') ? true : false));
Modified: trunk/umil/umil_frontend.php
==============================================================================
*** trunk/umil/umil_frontend.php (original)
--- trunk/umil/umil_frontend.php Sat Jun 27 06:05:14 2009
***************
*** 19,30 ****
if (!class_exists('umil'))
{
! if (!file_exists($phpbb_root_path . 'umil/umil.' . $phpEx))
{
trigger_error('Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
! include($phpbb_root_path . 'umil/umil.' . $phpEx);
}
/**
--- 19,30 ----
if (!class_exists('umil'))
{
! if (!file_exists(UMIL_ROOT_PATH . 'umil.' . PHP_EXT))
{
trigger_error('Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
}
! include UMIL_ROOT_PATH . 'umil.' . PHP_EXT;
}
/**
***************
*** 69,75 ****
$user->add_lang('install');
// Setup the template
! $template->set_custom_template($phpbb_root_path . 'umil/style', 'umil');
// The UMIL template is never stored in the database
$user->theme['template_storedb'] = false;
--- 69,75 ----
$user->add_lang('install');
// Setup the template
! $template->set_custom_template(UMIL_ROOT_PATH . 'style', 'umil');
// The UMIL template is never stored in the database
$user->theme['template_storedb'] = false;
***************
*** 85,91 ****
$template->assign_vars(array(
'SQL_LAYER' => $this->db->sql_layer,
! 'UMIL_ROOT_PATH' => $phpbb_root_path . 'umil/',
'U_ADM_INDEX' => append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id),
'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"),
--- 85,91 ----
$template->assign_vars(array(
'SQL_LAYER' => $this->db->sql_layer,
! 'UMIL_ROOT_PATH' => UMIL_ROOT_PATH,
'U_ADM_INDEX' => append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id),
'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"),
More information about the customisationdb-commits
mailing list