Revize 1278
Přidáno uživatelem Ondřej Fibich před asi 13 roky(ů)
| freenetis/branches/testing/application/helpers/url.php | ||
|---|---|---|
|
{
|
||
|
$uri = url_lang::site($uri);
|
||
|
}
|
||
|
|
||
|
|
||
|
if ($method == 'refresh')
|
||
|
{
|
||
|
header('Refresh: 0; url='.$uri);
|
||
| freenetis/branches/testing/application/helpers/url_lang.php | ||
|---|---|---|
|
{
|
||
|
$lang = Config::get('lang');
|
||
|
}
|
||
|
|
||
|
$index_page = '';
|
||
|
|
||
|
if (Settings::get('index_page'))
|
||
|
{
|
||
|
$index_page = 'index.php/';
|
||
|
}
|
||
|
|
||
|
return url::site($lang . '/' . trim($uri, '/'), $protocol);
|
||
|
return url::site($index_page . $lang . '/' . trim($uri, '/'), $protocol);
|
||
|
}
|
||
|
|
||
|
/*
|
||
| ... | ... | |
|
{
|
||
|
$lang = Config::get('lang');
|
||
|
}
|
||
|
|
||
|
$index_page = '';
|
||
|
|
||
|
if (Settings::get('index_page'))
|
||
|
{
|
||
|
$index_page = 'index.php/';
|
||
|
}
|
||
|
|
||
|
return url::redirect($lang . '/' . trim($uri, '/'), $method);
|
||
|
return url::redirect($index_page . $lang . '/' . trim($uri, '/'), $method);
|
||
|
}
|
||
|
|
||
|
/**
|
||
| freenetis/branches/testing/application/libraries/Settings.php | ||
|---|---|---|
|
{
|
||
|
return self::$cache[$key];
|
||
|
}
|
||
|
|
||
|
// value
|
||
|
$value = '';
|
||
|
|
||
|
// if not cached
|
||
|
if (!$cache)
|
||
|
// try if query return exception, for example config table doesn't exist
|
||
|
try
|
||
|
{
|
||
|
// try if query return exception, for example config table doesn't exist
|
||
|
try
|
||
|
{
|
||
|
$value = self::$config_model->get_value_from_name($key);
|
||
|
}
|
||
|
catch (Kohana_Database_Exception $e)
|
||
|
{
|
||
|
$value = '';
|
||
|
}
|
||
|
$value = self::$config_model->get_value_from_name($key);
|
||
|
}
|
||
|
catch (Kohana_Database_Exception $e)
|
||
|
{
|
||
|
$value = '';
|
||
|
}
|
||
|
|
||
|
// if we find not-null value, return it
|
||
|
if (!empty($value))
|
||
| freenetis/branches/testing/application/libraries/MY_Controller.php | ||
|---|---|---|
|
'forgotten_password',
|
||
|
'scheduler/run',
|
||
|
'installation',
|
||
|
'setup_config',
|
||
|
'setup_config/setup',
|
||
|
/* registration */
|
||
|
'registration',
|
||
|
'registration/complete',
|
||
Také k dispozici: Unified diff
Opravy:
- oprava presmerovani instalace
- oprava tridy Settings