Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 479

Přidáno uživatelem Michal Kliment před asi 15 roky(ů)

Mensi zaplaty, kontroler subnets upraven, nyni jiz pocita i s segmenty.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/models/subnet.php
class Subnet_Model extends ORM {
protected $has_many = array('ip_addresses');
protected $belongs_to = array('segment');
/**
* Function counts all subnets specified by filter.
......
$where .= ' AND '.$key.' LIKE \'%'.$value.'%\' COLLATE utf8_general_ci';
}
}
return self::$db->query("SELECT *
return self::$db->query("SELECT subnets.*, segments.name as segment
FROM subnets
LEFT JOIN segments ON subnets.segment_id = segments.id
$where
ORDER BY $order_by $order_by_direction
LIMIT $limit_from, $limit_results
freenetis/trunk/kohana/application/controllers/installation.php
$form->input('SWIFT')->label(url_lang::lang('texts.SWIFT'));
// fees
$form->group('')->label(url_lang::lang('texts.Fees'));
$form->input('entrance_fee')->label(url_lang::lang('texts.Entrance fee'))->rules('required|valid_numeric');
$form->input('entrance_fee')->label(url_lang::lang('texts.Entrance fee'))->rules('valid_numeric');
$form->input('regular_member_fee')->label(url_lang::lang('texts.Monthly member fee'))->rules('required|valid_numeric');
$form->input('transfer_fee')->label(url_lang::lang('texts.Transfer fee'))->rules('valid_numeric');
$form->input('penalty')->label(url_lang::lang('texts.Penalty'))->rules('valid_numeric');
freenetis/trunk/kohana/application/controllers/subnets.php
$grid->order_field('netmask')->label(url_lang::lang('texts.Netmask'));
$grid->order_field('redirect')->label(url_lang::lang('texts.Redir').'.')->bool(array(url_lang::lang('texts.No'),url_lang::lang('texts.Yes')))->class('center');
//$grid->order_field('OSPF_area_id')->label(url_lang::lang('texts.OSPF area ID'));
$grid->order_field('segment')->label(url_lang::lang('texts.Segment'));
if ($this->acl_check_view('Devices_Controller', 'subnet'))
$grid->action_field('id')->label(url_lang::lang('texts.Subnet')) ->url(url_lang::base().'subnets/show') ->action(url_lang::lang('texts.Show'))->class('center');
if ($this->acl_check_edit('Devices_Controller', 'subnet'))
......
Controller::error(ACCESS);
$headline = url_lang::lang('texts.Subnet').' '.$subnet->name;
$view = new View('main');
$view->title = $headline;
$view->content = new View('show_subnet');
$view->title = $headline;
$view->content = new View('subnets_show');
$view->content->subnet = $subnet;
$view->content->link_back = html::anchor(url_lang::base().'subnets/show_all', url_lang::lang('texts.Back to all subnets'));
$view->content->headline = $headline;
......
$subnet = new Subnet_Model();
if (!$this->acl_check_new('Devices_Controller', 'subnet'))
Controller::error(ACCESS);
$segment_model = new Segment_Model();
$segments = $segment_model->select(array('id','name'))->orderby('name')->find_all();
$arr_segments[0] = '----- '.url_lang::lang('texts.select segment').' -----';
foreach ($segments as $segment)
{
$arr_segments[$segment->id] = $segment->name;
}
$redirect[0] = url_lang::lang('texts.No');
$redirect[1] = url_lang::lang('texts.Yes');
......
$form->input('OSPF_area_id')->label(url_lang::lang('texts.OSPF area ID').':')->rules('valid_digit');
if ($this->acl_check_new('Devices_Controller', 'redirect'))
$form->dropdown('redirect')->label(url_lang::lang('texts.Redirect'))->options($redirect)->selected(0);
$form->dropdown('segment_id')->label(url_lang::lang('texts.Segment name'))->options($arr_segments)->rules('required');
$form->submit('submit')->value(url_lang::lang('texts.Save'));
special::required_forge_style($form, ' *', 'required');
......
$subnet->OSPF_area_id = $form_data['OSPF_area_id'];
if ($this->acl_check_new('Devices_Controller', 'redirect'))
$subnet->redirect = $form_data['redirect'];
$subnet->segment_id = $form_data['segment_id'];
unset($form_data);
if ($subnet->save())
......
Controller::error(RECORD);
if (!$this->acl_check_edit('Devices_Controller', 'subnet'))
Controller::error(ACCESS);
$segment_model = new Segment_Model();
$segments = $segment_model->select(array('id','name'))->orderby('name')->find_all();
$arr_segments[0] = '----- '.url_lang::lang('texts.select segment').' -----';
foreach ($segments as $segment)
{
$arr_segments[$segment->id] = $segment->name;
}
$redirect[0] = url_lang::lang('texts.No');
$redirect[1] = url_lang::lang('texts.Yes');
$this->form = $form = new Forge(url_lang::base()."subnets/edit/".$subnet_id, '', 'POST', array('id' => 'article_form'));
......
$form->input('OSPF_area_id')->label(url_lang::lang('texts.OSPF area ID').':')->rules('valid_digit')->value($subnet->OSPF_area_id);
if ($this->acl_check_edit('Devices_Controller', 'redirect'))
$form->dropdown('redirect')->label(url_lang::lang('texts.Redirect'))->options($redirect)->selected($subnet->redirect);
$form->dropdown('segment_id')->label(url_lang::lang('texts.Segment name'))->options($arr_segments)->rules('required')->selected($subnet->segment_id);
$form->submit('submit')->value(url_lang::lang('texts.update'));
special::required_forge_style($form, ' *', 'required');
......
$subnet->OSPF_area_id = $form_data['OSPF_area_id'];
if ($this->acl_check_edit('Devices_Controller', 'redirect'))
$subnet->redirect = $form_data['redirect'];
$subnet->segment_id = $form_data['segment_id'];
unset($form_data);
freenetis/trunk/kohana/application/controllers/ip_addresses.php
->select("id","name","network_address as net_str",
"inet_aton(network_address) as net",
"32-log2((~inet_aton(netmask) & 0xffffffff) + 1) as mask")
->orderby('net')->find_all();
->orderby('net')->find_all_by_segment_id($iface->segment_id);
$arr_subnets[0] = '----- '.url_lang::lang('texts.select subnet').' -----';
......
$subnet_model = new Subnet_Model();
$subnets = $subnet_model
->select("id","name","network_address as net_str",
"inet_aton(network_address) as net",
"32-log2((~inet_aton(netmask) & 0xffffffff) + 1) as mask")
->orderby('net')->find_all();
if ($ip_address->iface_id)
{
$subnets = $subnet_model
->select("id","name","network_address as net_str",
"inet_aton(network_address) as net",
"32-log2((~inet_aton(netmask) & 0xffffffff) + 1) as mask")
->orderby('net')->find_all_by_segment_id($ip_address->iface->segment_id);
}
else
{
$subnets = $subnet_model
->select("id","name","network_address as net_str",
"inet_aton(network_address) as net",
"32-log2((~inet_aton(netmask) & 0xffffffff) + 1) as mask")
->orderby('net')->find_all();
}
foreach ($subnets as $subnet)
{
freenetis/trunk/kohana/application/controllers/devices.php
$arr_subnets_masks, SORT_NUMERIC, SORT_ASC,
$arr_subnets_ids, SORT_NUMERIC, SORT_ASC,
$arr_subnets_netnames, SORT_STRING, SORT_ASC);
// segments
$segment_model = new Segment_Model();
$segments = $segment_model->select(array('id','name'))->orderby('name')->find_all();
$arr_segments[0] = '----- '.url_lang::lang('texts.select segment').' -----';
foreach ($segments as $segment)
{
$arr_segments[$segment->id] = $segment->name;
}
// streets
$street_model = new Street_Model();
$streets = $street_model->orderby('street')->find_all();
......
// adding interface
$form->group('')->label(url_lang::lang('texts.Interface'));
$form->input('mac')->label(url_lang::lang('texts.MAC').':')->rules('required|length[3,250]');
$form->dropdown('segment_id')->label(url_lang::lang('texts.Segment name').':')->options($arr_segments)->rules('required');
//$form->dropdown('segment_id')->label(url_lang::lang('texts.Segment name').':')->options($arr_segments)->rules('required');
// wireless settings of interface
$form->checkbox('add_wireless')->label(url_lang::lang('texts.Save wireless setting'))->value(1);
$form->dropdown('wmode')->label(url_lang::lang('texts.Mode').':')->options($arr_modes)->callback(array($this, 'valid_mode'));
......
$device_engineer->device_id = $device_model->id;
$device_engineer->user_id = $form_data["first_engineer_id"];
$device_engineer_saved = $device_engineer->save();
$subnet = new Subnet_Model($form_data['subnet_id']);
// interface model
$iface_model = new Iface_Model();
$iface_model->device_id = $device_model->id;
$iface_model->segment_id = $form_data["segment_id"];
$iface_model->segment_id = $subnet->segment_id;
$iface_model->mac = htmlspecialchars($form_data["mac"]);
$iface_model->name = $device_model->name;
$iface_model_saved = $iface_model->save();
......
$ip_address_model = new ip_address_Model();
$ip_address_model->iface_id = $iface_model->id;
$ip_address_model->vlan_iface_id = NULL;
$ip_address_model->subnet_id = $form_data['subnet_id'];
$ip_address_model->subnet_id = $subnet->id;
$ip_address_model->ip_address = $form_data['ip_address'];
$ip_address_model->dhcp = NULL;
$ip_address_saved = $ip_address_model->save();
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql_470.php
), (
'51', 'Members_Controller', 'registration'
), (
'59', 'Users_Controller', 'phone'
), (
'59', 'Users_Controller', 'email'
), (
'56', 'Accounts_Controller', 'unidentified_transfers'
freenetis/trunk/kohana/application/libraries/MY_Controller.php
public function __construct()
{
parent::__construct();
parent::__construct();
// database connection
if(!$this->test_db())
{
......
die();
}
// database upgrade goes here
$this->get_current_svn_db_schema_info();
$this->get_current_svn_db_schema_info();
$this->setting = new Setting();
if (!$this->setting->db_schema_version)
{
if (url_lang::current()!='installation')
url::redirect(url_lang::base().'installation');
}
else if ($this->current_svn_db_schema_version != $this->setting->db_schema_version)
{
$this->upgrade_sql($this->setting->db_schema_version);
}
// test if visitor is logged in, or he accesses public controllers like registration, redirect, installation
{
if (url_lang::current()!='installation')
url::redirect(url_lang::base().'installation');
}
else if ($this->current_svn_db_schema_version != $this->setting->db_schema_version)
{
$this->upgrade_sql($this->setting->db_schema_version);
}
// test if visitor is logged in, or he accesses public controllers like registration, redirect, installation
if (!$this->session->get('user_id', 0) && url_lang::current()!='login' &&
url_lang::current() != 'registration' && url_lang::current()!='scheduler/run' &&
strpos(url_lang::current(), 'redirect')===false)
strpos(url_lang::current(), 'redirect')===false && url_lang::current()!='installation')
{
// Not logged in - redirect to login page
$this->session->set_flash('err_message', url_lang::lang('texts.Must be logged in'));
......
url::redirect(url_lang::base().'login');
die();
}
/**
* @todo: after removing all direct calls made through $gacl_class,
* remove the phpgacl initialization - so components which does not
freenetis/trunk/kohana/application/views/subnets_show.php
<h2><?php echo $headline ?></h2>
<?php
echo ($message = $this->session->get('message')) ? '<div class="message">'.$message.'</div>' : '';
if (isset($submenu))
echo '<div class="submenu">'.$submenu.'</div>';
$links[] = $link_back;
if ($this->acl_check_edit('Devices_Controller', 'subnet'))
$links[] = html::anchor(url_lang::base().'subnets/edit/'.$subnet->id, url_lang::lang('texts.Edit'));
if ($this->acl_check_view('Devices_Controller', 'subnet'))
{
$links[] = html::anchor(url_lang::base().'subnets/csv_export/'.$subnet->id, url_lang::lang('texts.Export to CSV (utf-8)'));
$links[] = html::anchor(url_lang::base().'subnets/csv_export/'.$subnet->id.'/windows-1250', url_lang::lang('texts.Export to CSV (windows-1250)'));
}
echo implode(' | ', $links);
?>
<br /><br />
<table class="extended" cellspacing="0">
<tr>
<th><?php echo url_lang::lang('texts.ID') ?></th>
<td><?php echo $subnet->id ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Subnet name') ?></th>
<td><?php echo $subnet->name ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Network address') ?></th>
<td><?php echo $subnet->network_address ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Netmask') ?></th>
<td><?php echo $subnet->netmask ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.OSPF area ID') ?></th>
<td><?php echo $subnet->OSPF_area_id ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Redirect') ?></th>
<td><?php echo ($subnet->redirect == 1) ? url_lang::lang('texts.Yes') : url_lang::lang('texts.No') ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Segment') ?></th>
<td><?php echo $subnet->segment->name ?></td>
</tr>
</table>
freenetis/trunk/kohana/system/core/Kohana.php
// Disable magic_quotes_runtime. The Input library takes care of
// magic_quotes_gpc later.
set_magic_quotes_runtime(0);
//set_magic_quotes_runtime(0);
// Send default text/html UTF-8 header
header('Content-type: text/html; charset=UTF-8');

Také k dispozici: Unified diff