Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 922

Přidáno uživatelem Jiří Sviták před více než 13 roky(ů)

odeslano do hl. vetve - Na zadost Roberta rozsireno docasne stare redirect/info o clenovo ID. Uprava paticky, pridana statistika casu a pameti.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/core.php
'send error report' => 'Zaslat chybové hlášení',
'server error' => 'Chyba serveru',
'stack_trace' => 'Trasování zásobníku',
'stats_footer' => 'Načteno za {execution_time} sekund, použito {memory_usage} paměti. Generovánou Kohanou v{kohana_version}.',
//'stats_footer' => 'Načteno za {execution_time} sekund, použito {memory_usage} paměti. Generovánou Kohanou v{kohana_version}.',
'stats_footer' => 'Načteno za {execution_time} sekund, použito {memory_usage} paměti.',
'unknown error' => 'Neznámá chyba',
);
?>
freenetis/trunk/kohana/application/controllers/redirect.php
$content = '';
$subnet_name = '';
$member_name = '';
$member_id = '';
$login = '';
$continue = 0;
$device_engineers = array();
......
if ($ip_address->id != 0)
{
$member_name = $ip_address->iface->device->user->member->name;
$member_id = $ip_address->iface->device->user->member_id;
$login = $ip_address->iface->device->user->login;
$device_engineer_model = new Device_engineer_Model();
$device_engineers = $device_engineer_model->get_device_engineers($ip_address->iface->device_id);
......
$subnet_model = new Subnet_Model();
$subnet = $subnet_model->get_subnet_of_ip_address(server::remote_addr());
// remote ip address belongs to some subnet
if (count($subnet) > 0)
if (!empty($subnet))
{
//$subnet = $arr_subnets[0];
$subnet_name = $subnet->name;
......
$view->title = url_lang::lang('texts.Redirection');
$view->subnet_name = $subnet_name;
$view->member_name = $member_name;
$view->member_id = $member_id;
$view->login = $login;
$view->device_engineers = $device_engineers;
$view->device_admins = $device_admins;
freenetis/trunk/kohana/application/views/main.php
<div id="footer" class="noprint">
<div id="footer-padd">
<?php
$footer_links[] = html::anchor("http://wiki.freenetis.org/", url_lang::lang('texts.Documentation'));
$footer_links[] = html::anchor("http://sourceforge.net/projects/freenetis/", url_lang::lang('texts.Project site'));
echo '&nbsp;'.implode(' | ', $footer_links);
$footer_links[] = html::anchor("http://freenetis.org/", url_lang::lang('texts.Project site'));
//$footer_links[] = html::anchor("http://sourceforge.net/projects/freenetis/", url_lang::lang('texts.Project site'));
$links = implode(' | ', $footer_links);
$stats = Kohana::lang('core.stats_footer');
?>
<p style="float:left; margin-left:10px;"><?php echo $links ?></p>
<p style="float:right; margin-right:10px;"><?php echo $stats ?></p>
<div class="clear"></div>
</div>
</div>
</div>
freenetis/trunk/kohana/application/views/login.php
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="Freenetis" />
<meta name="description" content="Freenetis" />
<title><?php echo $title ?> | <?php echo $this->settings->get('title') ?></title>
<?php echo html::stylesheet('media/css/installation.css', 'screen and (min-device-width: 481px)') ?>
<!--[if IE]>
freenetis/trunk/kohana/application/views/redirect.php
<td class="bold"><?php echo $member_name ?></td>
</tr>
<?php } ?>
<?php if (!empty($member_id)) { ?>
<tr>
<td class="orange"><?php echo url_lang::lang('texts.Member ID').':' ?></td>
<td class="bold"><?php echo $member_id ?></td>
</tr>
<?php } ?>
<?php if (!empty($login)) { ?>
<tr>
<td class="orange"><?php echo url_lang::lang('texts.Login name').':' ?></td>
freenetis/trunk/kohana/system/i18n/en_US/core.php
'no_default_route' => 'Please set a default route in <tt>config/routes.php</tt>.',
'no_controller' => 'Kohana was not able to determine a controller to process this request: %s',
'page_not_found' => 'The page you requested, <tt>%s</tt>, could not be found.',
'stats_footer' => 'Loaded in {execution_time} seconds, using {memory_usage} of memory. Generated by Kohana v{kohana_version}.',
// not everybody needs to know our version of kohana
//'stats_footer' => 'Loaded in {execution_time} seconds, using {memory_usage} of memory. Generated by Kohana v{kohana_version}.',
// this one is without kohana version
'stats_footer' => 'Loaded in {execution_time} seconds, using {memory_usage} of memory.',
'error_message' => 'Error occurred at <strong>line %s</strong> of <strong>%s</strong>.',
'stack_trace' => 'Stack Trace',
'generic_error' => 'Unable to Complete Request',

Také k dispozici: Unified diff