Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1294

Přidáno uživatelem Ondřej Fibich před asi 13 roky(ů)

Opravy:

- oprava v preklepu cesty k pohledu pro zobrazeni ip adresy

Upravy:

- odstraneni debugovacich informaci u session cookie driveru

Zobrazit rozdíly:

freenetis/branches/testing/application/views/ip_adresses/show.php
<h2><?php echo $headline ?></h2>
<?php if (isset($submenu)) echo '<div class="submenu">'.$submenu.'</div>'; ?>
<?php
$links = array();
if (!$ip_address->member_id && $this->acl_check_edit('Devices_Controller', 'ip_address'))
$links[] = html::anchor('ip_addresses/edit/'.$ip_address->id, __('Edit'));
if (!$ip_address->member_id && $this->acl_check_delete('Devices_Controller', 'ip_address'))
$links[] = html::anchor('ip_addresses/delete/'.$ip_address->id, __('Delete'));
if ($this->acl_check_new('Messages_Controller', 'ip_address'))
$links[] = html::anchor('redirect/activate_to_ip_address/'.$ip_address->id, __('Activate redirection'));
if ($this->acl_check_view('Messages_Controller', 'ip_address'))
$links[] = html::anchor(url::base().'redirection/?ip_address='.$ip_address->ip_address, __('Redirection preview'));
echo implode(' | ', $links);
?>
<br /><br />
<table class="extended" cellspacing="0" style="float:left;">
<tr>
<th><?php echo __('ID') ?></th>
<td><?php echo $ip_address->id ?></td>
</tr>
<tr>
<th><?php echo __('IP address') ?></th>
<td><?php echo $ip_address->ip_address ?></td>
</tr>
<?php if (!$ip_address->member_id): ?>
<tr>
<th><?php echo __('Member') ?></th>
<td><?php echo html::anchor('members/show/'.$member->id, $member->name) ?></td>
</tr>
<?php else: ?>
<tr>
<th><?php echo __('Member') ?></th>
<td><?php echo html::anchor('members/show/'.$ip_address->member_id, $ip_address->member->name) ?></td>
</tr>
<?php endif ?>
<?php if (!$ip_address->member_id): ?>
<tr>
<th><?php echo __('Device') ?></th>
<td><?php echo html::anchor('devices/show/'.$device->id, $device->name) ?></td>
</tr>
<?php if (url_lang::current(TRUE) == 'devices'): ?>
<tr>
<th><?php echo __('Interface') ?></th>
<td><?php echo html::anchor('devices/show_iface/'.$iface->id, $iface->mac) ?></td>
</tr>
<?php if (isset($vlan_iface)) { ?>
<tr>
<th><?php echo __('VLAN Interface') ?></th>
<td><?php echo html::anchor('devices/show_vlan_iface/'.$vlan_iface->id, $vlan_iface->name) ?></td>
</tr>
<?php } ?>
<?php else: ?>
<tr>
<th><?php echo __('Interface') ?></th>
<td><?php echo html::anchor('ifaces/show/'.$iface->id, $iface->mac) ?></td>
</tr>
<?php if (isset($vlan_iface)) { ?>
<tr>
<th><?php echo __('VLAN Interface') ?></th>
<td><?php echo html::anchor('vlan_ifaces/show/'.$vlan_iface->id, $vlan_iface->name) ?></td>
</tr>
<?php } ?>
<?php endif ?>
<?php endif ?>
</table>
<table class="extended" cellspacing="0" style="float:left; margin-left:10px;">
<tr>
<th><?php echo __('Subnet name') ?></th>
<td><?php echo html::anchor('subnets/show/'.$ip_address->subnet_id, $ip_address->subnet->name) ?></td>
</tr>
<tr>
<th><?php echo __('Subnet network address') ?></th>
<td><?php echo $ip_address->subnet->network_address ?></td>
</tr>
<tr>
<th><?php echo __('Subnet netmask') ?></th>
<td><?php echo $ip_address->subnet->netmask ?></td>
</tr>
<tr>
<th><?php echo __('Gateway').'&nbsp;'.help::hint('gateway') ?></th>
<td><?php echo $ip_address->gateway ? __('Yes') : __('No') ?></td>
</tr>
<tr>
<th><?php echo __('Service').'&nbsp;'.help::hint('service') ?></th>
<td><?php echo $ip_address->service ? __('Yes') : __('No') ?></td>
</tr>
<tr>
<th><?php echo __('Whitelist').'&nbsp;'.help::hint('whitelist') ?></th>
<td><?php echo $whitelist_types[($ip_address->whitelisted === null) ? 0 : $ip_address->whitelisted] ?></td>
</tr>
</table>
<br class="clear"/>
<br />
<?php echo $grid ?>
freenetis/branches/testing/application/views/ip_addresses/show.php
<h2><?php echo $headline ?></h2>
<?php if (isset($submenu)) echo '<div class="submenu">'.$submenu.'</div>'; ?>
<?php
$links = array();
if (!$ip_address->member_id && $this->acl_check_edit('Devices_Controller', 'ip_address'))
$links[] = html::anchor('ip_addresses/edit/'.$ip_address->id, __('Edit'));
if (!$ip_address->member_id && $this->acl_check_delete('Devices_Controller', 'ip_address'))
$links[] = html::anchor('ip_addresses/delete/'.$ip_address->id, __('Delete'));
if ($this->acl_check_new('Messages_Controller', 'ip_address'))
$links[] = html::anchor('redirect/activate_to_ip_address/'.$ip_address->id, __('Activate redirection'));
if ($this->acl_check_view('Messages_Controller', 'ip_address'))
$links[] = html::anchor(url::base().'redirection/?ip_address='.$ip_address->ip_address, __('Redirection preview'));
echo implode(' | ', $links);
?>
<br /><br />
<table class="extended" cellspacing="0" style="float:left;">
<tr>
<th><?php echo __('ID') ?></th>
<td><?php echo $ip_address->id ?></td>
</tr>
<tr>
<th><?php echo __('IP address') ?></th>
<td><?php echo $ip_address->ip_address ?></td>
</tr>
<?php if (!$ip_address->member_id): ?>
<tr>
<th><?php echo __('Member') ?></th>
<td><?php echo html::anchor('members/show/'.$member->id, $member->name) ?></td>
</tr>
<?php else: ?>
<tr>
<th><?php echo __('Member') ?></th>
<td><?php echo html::anchor('members/show/'.$ip_address->member_id, $ip_address->member->name) ?></td>
</tr>
<?php endif ?>
<?php if (!$ip_address->member_id): ?>
<tr>
<th><?php echo __('Device') ?></th>
<td><?php echo html::anchor('devices/show/'.$device->id, $device->name) ?></td>
</tr>
<?php if (url_lang::current(TRUE) == 'devices'): ?>
<tr>
<th><?php echo __('Interface') ?></th>
<td><?php echo html::anchor('devices/show_iface/'.$iface->id, $iface->mac) ?></td>
</tr>
<?php if (isset($vlan_iface)) { ?>
<tr>
<th><?php echo __('VLAN Interface') ?></th>
<td><?php echo html::anchor('devices/show_vlan_iface/'.$vlan_iface->id, $vlan_iface->name) ?></td>
</tr>
<?php } ?>
<?php else: ?>
<tr>
<th><?php echo __('Interface') ?></th>
<td><?php echo html::anchor('ifaces/show/'.$iface->id, $iface->mac) ?></td>
</tr>
<?php if (isset($vlan_iface)) { ?>
<tr>
<th><?php echo __('VLAN Interface') ?></th>
<td><?php echo html::anchor('vlan_ifaces/show/'.$vlan_iface->id, $vlan_iface->name) ?></td>
</tr>
<?php } ?>
<?php endif ?>
<?php endif ?>
</table>
<table class="extended" cellspacing="0" style="float:left; margin-left:10px;">
<tr>
<th><?php echo __('Subnet name') ?></th>
<td><?php echo html::anchor('subnets/show/'.$ip_address->subnet_id, $ip_address->subnet->name) ?></td>
</tr>
<tr>
<th><?php echo __('Subnet network address') ?></th>
<td><?php echo $ip_address->subnet->network_address ?></td>
</tr>
<tr>
<th><?php echo __('Subnet netmask') ?></th>
<td><?php echo $ip_address->subnet->netmask ?></td>
</tr>
<tr>
<th><?php echo __('Gateway').'&nbsp;'.help::hint('gateway') ?></th>
<td><?php echo $ip_address->gateway ? __('Yes') : __('No') ?></td>
</tr>
<tr>
<th><?php echo __('Service').'&nbsp;'.help::hint('service') ?></th>
<td><?php echo $ip_address->service ? __('Yes') : __('No') ?></td>
</tr>
<tr>
<th><?php echo __('Whitelist').'&nbsp;'.help::hint('whitelist') ?></th>
<td><?php echo $whitelist_types[($ip_address->whitelisted === null) ? 0 : $ip_address->whitelisted] ?></td>
</tr>
</table>
<br class="clear"/>
<br />
<?php echo $grid ?>
freenetis/branches/testing/system/libraries/drivers/Session/Cookie.php
if (strlen($data) > 4048)
{
Log::add('error', 'Session data exceeds the 4kB limit, ignoring write, data: [' . $id . '] ' . $this->read($data));
Log::add('error', 'Session data exceeds the 4kB limit, ignoring write.');
return FALSE;
}
......
return TRUE;
}
} // End Session Cookie Driver Class
} // End Session Cookie Driver Class

Také k dispozici: Unified diff