Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1002

Přidáno uživatelem Michal Kliment před více než 13 roky(ů)

Merge z testingu do trunku: Oprava chyby, ktera pri vypnutych cistych URL znemoznovala odesilat vetsinu formularu. Vylepseno odchytani neexistence souboru .htaccess-sample.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/helpers/url.php
*/
public static function base($index = FALSE, $protocol = FALSE)
{
$base_url = url::protocol().'://'.url::domain().url::suffix();
$index_page = ($index && Settings::get('index_page')) ? 'index.php/' : '';
$base_url = url::protocol().'://'.url::domain().url::suffix().$index_page;
return $base_url;
}
freenetis/trunk/kohana/application/helpers/path.php
for ($i=count($path)-2;$i>=0;$i--)
{
if ($path[$i] != url::base().url::current())
if ($path[$i] != url::base(TRUE).url::current())
$steps--;
if (!$steps)
freenetis/trunk/kohana/application/controllers/users.php
Controller::error(ACCESS);
}
/** @var $grid grid_Core */
$grid_contacts = new Grid(url::base().url::current(true), null, array(
$grid_contacts = new Grid(url::base(TRUE).url::current(true), null, array(
'use_paginator' => false,
'use_selector' => false
));
......
if ($this->acl_check_new('Private_phone_contacts_Controller', 'contacts', $user->member_id))
{
$grid_private_contacts = new Grid(url::base().url::current(true), null, array(
$grid_private_contacts = new Grid(url::base(TRUE).url::current(true), null, array(
'use_paginator' => false,
'use_selector' => false
));
freenetis/trunk/kohana/application/controllers/private_phone_contacts.php
Controller::error(ACCESS);
}
$form = new Forge(url::base().url::current(true), '', 'POST');
$form = new Forge(url::base(TRUE).url::current(true), '', 'POST');
$form->input('description')->label(url_lang::lang('texts.Description') . ':')->rules('required');
$form->submit(url_lang::lang('texts.Save'));
$form->hidden('redirect');
......
Controller::error(ACCESS);
}
$form = new Forge(url::base().url::current(true), '', 'POST');
$form = new Forge(url::base(TRUE).url::current(true), '', 'POST');
$form->input('description')->label(url_lang::lang('texts.Description') . ':')
->rules('required')->value($pucontact->description);
$form->submit(url_lang::lang('texts.Save'));
freenetis/trunk/kohana/application/controllers/towns.php
Controller::error(ACCESS);
// creates new form
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->input('town')->label(url_lang::lang('texts.Town').':')->rules('required|length[1,50]')->callback(array($this,'check_town'));
freenetis/trunk/kohana/application/controllers/mail.php
$message->save();
}
}
url::redirect(url::base().url::current(TRUE));
url::redirect(url::base(TRUE).url::current(TRUE));
}
$view = new View('main');
......
}
}
}
url::redirect(url::base().url::current(TRUE));
url::redirect(url::base(TRUE).url::current(TRUE));
}
$view = new View('main');
......
$to_value = $to_user->login;
}
$form = new Forge(url::base().url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->input('to')->label(url_lang::lang('texts.To').':')->class('mail_to_field')->rules('required')->value($to_value)->callback(array($this, 'valid_to_field'))->help(help::hint('mail_to_field'));
freenetis/trunk/kohana/application/controllers/subnets.php
$arr_members = arr::merge (array(NULL => '----- '.url_lang::lang('texts.Select member').' -----'), arr::from_objects(ORM::factory('member')->get_all_members_to_dropdown()));
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic data'));
$form->input('name')->label(url_lang::lang('texts.Subnet name').':')->rules('required|length[3,250]');
freenetis/trunk/kohana/application/controllers/streets.php
Controller::error(ACCESS);
// creates new form
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->input('street')->label(url_lang::lang('texts.Street').':')->rules('required|length[1,50]')->callback(array($this,'check_street'));
freenetis/trunk/kohana/application/controllers/votes.php
$vote_options = array(0 => url_lang::lang('texts.Abstain'));
}
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->dropdown('vote')->label(url_lang::lang('texts.Vote'))->options($vote_options);
......
break;
}
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->dropdown('vote')->label(url_lang::lang('texts.Vote'))->options($vote_options)->selected($vote->vote);
freenetis/trunk/kohana/application/controllers/ip_addresses.php
$link_back = html::anchor($link_back_url, url_lang::lang('texts.Back to IP addresses list'));
}
$this->form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$this->form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$this->form->set_attr('class', 'form_class')->set_attr('method', 'post');
$arr_ifaces = array();
freenetis/trunk/kohana/application/controllers/phone_invoices.php
Controller::error(ACCESS);
}
$form = new Forge(url::base().url::current(true), '', 'POST', array('id' => 'phone_invoices_form'));
$form = new Forge(url::base(TRUE).url::current(true), '', 'POST', array('id' => 'phone_invoices_form'));
$form->textarea('parse')->label(url_lang::lang('texts.Text to parse') . ':')->rules('required');
$form->checkbox('test_number_count_enabled')->checked(TRUE)->value('1')
->label(url_lang::lang('texts.Enable integrity test (all numbers in invoice has to be in extended statement)'));
......
$query = $phone_invoice_model->get_all_phone_invoices();
$grid = new Grid(url::base().url::current(true), null, array(
$grid = new Grid(url::base(TRUE).url::current(true), null, array(
'use_paginator' => false,
'use_selector' => false
));
......
$users_data[$u->id] = $u->username;
}
$form = new Forge(url::base().url::current(true), '', 'POST', array('id' => 'phone_invoices_form'));
$form = new Forge(url::base(TRUE).url::current(true), '', 'POST', array('id' => 'phone_invoices_form'));
$form->dropdown('user_id')->label(url_lang::lang('texts.Phone') .' '. $phone_inv_user_model->phone_number)
->options($users_data)->selected($phone_inv_user_model->user_id)->rules('required');
......
$phone_inv_user_model = new Phone_invoice_user_Model();
$users_inv = $phone_inv_user_model->get_phone_invoices_of_user($user_id);
$grid = new Grid(url::base().url::current(true), null, array(
$grid = new Grid(url::base(TRUE).url::current(true), null, array(
'use_paginator' => false,
'use_selector' => false
));
freenetis/trunk/kohana/application/controllers/segments.php
if ($id != Segment_Model::$roaming || !$roaming)
$media[$id] = url_lang::lang('texts.'.$type);
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic data'));
freenetis/trunk/kohana/application/controllers/allowed_subnets.php
$current_subnet = $subnet_model->get_subnet_without_allowed_subnets_of_member_by_ip_address ($member->id, server::remote_addr());
$selected = ($current_subnet && $current_subnet->id) ? $current_subnet->id : 0;
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->dropdown('subnet_id')->label(url_lang::lang('texts.Subnet').':')->rules('required')->options($arr_subnets)->selected($selected)->add_button('subnets');
freenetis/trunk/kohana/application/controllers/members.php
$phone_prefixes = $country_model->select_country_list();
// form
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic information'));
freenetis/trunk/kohana/application/controllers/members_fees.php
foreach ($arr_members_fees as $fee_type_id => $member_fee)
{
// create grid
$members_fees_grids[$fee_type_id] = new Grid(url::base().url::current(), '', array(
$members_fees_grids[$fee_type_id] = new Grid(url::base(TRUE).url::current(), '', array(
'use_paginator' => false,
'use_selector' => false,
'total_items' => count($member_fee)
......
$arr_fees = arr::merge(array(NULL => '----- '.url_lang::lang('texts.Select fee').' -----'), $arr_fees);
// creates form
$form = new Forge(url::base().url::current(), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->dropdown('member_id')->label(url_lang::lang('texts.Member').':')->options($arr_members)->rules('required');
......
$arr_fees[$members_fee->fee_id] = "$name - ".$members_fee->fee->fee." ".$this->settings->get('currency')." ($from-$to)";
// creates form
$form = new Forge(url::base().url::current(), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
// stores members_fee_id for callback function
freenetis/trunk/kohana/application/controllers/settings.php
$this->form->input('domain')->label(url_lang::lang('texts.Domain').':')->rules('required|length[3,100]')->value(url::domain());
$this->form->input('suffix')->label(url_lang::lang('texts.Suffix').':')->rules('required|valid_suffix')->value(url::suffix());
$this->form->radio('clean_urls')->label(url_lang::lang('texts.Clean URLs').':')->options(array('1'=>url_lang::lang('texts.Yes'),'0'=>url_lang::lang('texts.No')))->default(!$this->settings->get('index_page'))->help(url_lang::lang('texts.URL addresses without index.php.'));
// load .htaccess sample file
if (($htaccessFile = @file('.htaccess-sample')) != FALSE)
{
$this->form->radio('clean_urls')->label(url_lang::lang('texts.Clean URLs').':')->options(array('1'=>url_lang::lang('texts.Yes'),'0'=>url_lang::lang('texts.No')))->default(!$this->settings->get('index_page'))->help(url_lang::lang('texts.URL addresses without index.php.'));
$this->form->group('')->label(url_lang::lang('texts.Network settings'));
foreach ($htaccessFile as $line_num => $line)
{
// find line with RewriteBase
if (preg_match("/^RewriteBase (.+)/", $line, $matches))
{
// and set there our suffix (subdirectory)
$htaccessFile[$line_num] = preg_replace("/^(RewriteBase )(.+)/", '${1}'.url::suffix(), $line);
}
}
$this->form->input('address_ranges')->label(url_lang::lang('texts.Address ranges').':')->rules('valid_address_ranges')->value(Settings::get('address_ranges'));
// write textarea with content of .htaccess sample file
if (!is_writable('.') && !file_exists('.htaccess'))
{
$textarea = '';
foreach ($htaccessFile as $line)
$textarea .= htmlentities ($line);
// load .htaccess sample file
$htaccessFile = file('.htaccess-sample');
foreach ($htaccessFile as $line_num => $line)
{
// find line with RewriteBase
if (preg_match("/^RewriteBase (.+)/", $line, $matches))
{
// and set there our suffix (subdirectory)
$htaccessFile[$line_num] = preg_replace("/^(RewriteBase )(.+)/", '${1}'.url::suffix(), $line);
}
$this->form->textarea('htaccess')->label(url_lang::lang('texts.Content of file htaccess').':')->value($textarea)->help(url_lang::lang('texts.It\'s not possible to write your htacess file for clean URLS.').' '.url_lang::lang('texts.You must create it manually and paste the following text into it.'));
}
}
// write textarea with content of .htaccess sample file
if (!is_writable('.') && !file_exists('.htaccess'))
{
$textarea = '';
foreach ($htaccessFile as $line)
$textarea .= htmlentities ($line);
$this->form->group('')->label(url_lang::lang('texts.Network settings'));
$this->form->textarea('htaccess')->label(url_lang::lang('texts.Content of file htaccess').':')->value($textarea)->help(url_lang::lang('texts.It\'s not possible to write your htacess file for clean URLS.').' '.url_lang::lang('texts.You must create it manually and paste the following text into it.'));
}
$this->form->input('address_ranges')->label(url_lang::lang('texts.Address ranges').':')->rules('valid_address_ranges')->value(Settings::get('address_ranges'));
$this->form->submit('submit')->value(url_lang::lang('texts.Save'));
special::required_forge_style($this->form, ' *', 'required');
freenetis/trunk/kohana/application/controllers/vlans.php
$vlan = new vlan_Model();
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic data'));
freenetis/trunk/kohana/application/controllers/allowed_subnets_counts.php
if (!$member->id || $member->id == 1)
Controller::error(RECORD);
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->input('allowed_subnets_count')->label(url_lang::lang('texts.Count of allowed subnets').': '.help::hint('allowed_subnets_count'))->rules('valid_numeric')->value($member->allowed_subnets_count->count);
freenetis/trunk/kohana/application/controllers/work_reports.php
}
}
}
url::redirect(url::base().url::current(TRUE));
url::redirect(url::base(TRUE).url::current(TRUE));
}
$view = new View('main');
freenetis/trunk/kohana/application/controllers/works.php
}
}
$this->session->set_flash('message', url_lang::lang('texts.Votes has been successfully updated.'));
url::redirect(url::base().url::current(TRUE));
url::redirect(url::base(TRUE).url::current(TRUE));
}
$view = new View('main');
......
}
$this->session->set_flash('message', url_lang::lang('texts.Votes has been successfully updated.'));
url::redirect(url::base().url::current(TRUE));
url::redirect(url::base(TRUE).url::current(TRUE));
}
// breadcrumbs navigation
freenetis/trunk/kohana/application/controllers/approval_types.php
}
// form
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic information'));
freenetis/trunk/kohana/application/controllers/mail_messages.php
$to_value = $to_user->login;
}
$form = new Forge(url::base().url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->input('to')->label(url_lang::lang('texts.To').':')->class('mail_to_field')->rules('required')->value($to_value)->callback(array($this, 'valid_to_field'))->help(help::show('mail_to_field'));;
freenetis/trunk/kohana/application/controllers/ulogd.php
$grid->datasource($members_traffics);
// form to select date
$form = new Forge(url::base().url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Choose date'));
$form->input('date_from')->label(url_lang::lang('texts.Date from').':')->rules('required|valid_date_string')->value($date_from);
freenetis/trunk/kohana/application/controllers/devices.php
if (($sql_offset = ($page - 1) * $limit_results) > $total_devices)
$sql_offset = 0;
$order_form = new Forge(url::base().url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$order_form = new Forge(url::base(TRUE).url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$order_form->set_attr('class', 'form_class')->set_attr('method', 'post');
$order_form->dropdown('order_by')->label(url_lang::lang('texts.Order by').':')->options($allowed_order_by)->rules('required')->selected($order_by);
$order_form->dropdown('order_by_direction')->label(url_lang::lang('texts.Direction').':')->options($allowed_order_by_direction)->rules('required')->selected($order_by_direction);
......
$sec_links = array();
foreach ($sections as $anchor => $label)
$sec_links[] = html::anchor (url::base().url::current(TRUE).'#'.$anchor, $label);
$sec_links[] = html::anchor (url::base(TRUE).url::current(TRUE).'#'.$anchor, $label);
$view = new View('main');
......
asort($arr_towns);
// forge form
$form = new Forge(url::base().url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE),'', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic data'));
$form->dropdown('user_id')->label(url_lang::lang('texts.User'))->options($arr_users)->rules('required')->selected($selected);
freenetis/trunk/kohana/application/controllers/comments.php
break;
}
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->textarea('text')->label(url_lang::lang('text.Text').':')->rules('required');
......
break;
}
$form = new Forge(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form = new Forge(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->textarea('text')->label(url_lang::lang('text.Text').':')->rules('required')->value($comment->text);
freenetis/trunk/kohana/application/libraries/MY_Controller.php
{
$path = $paths[$this->session->get('last_path_id')];
if ($path[count($path)-1] != url::base().url::current())
if ($path[count($path)-1] != url::base(TRUE).url::current())
{
if (url::base().url::previous() != $path[count($path)-1])
{
......
$path = NULL;
foreach ($paths[$this->session->get('last_path_id')] as $i => $url)
{
if (url::base().url::current() == $url)
if (url::base(TRUE).url::current() == $url)
{
$path = array_slice($paths[$this->session->get('last_path_id')], 0, $i+1);
break;
}
}
if (!$path)
$paths[$this->session->get('last_path_id')][] = url::base().url::current();
$paths[$this->session->get('last_path_id')][] = url::base(TRUE).url::current();
else
$paths[$this->session->get('last_path_id')] = $path;
}
}
else
$paths[$this->session->get('last_path_id')][] = url::base().url::current();
$paths[$this->session->get('last_path_id')][] = url::base(TRUE).url::current();
}
$this->session->set('paths', $paths);
freenetis/trunk/kohana/application/views/main.php
});
if (history.length == 1 && document.referrer != "")
$.post("<?php echo url_lang::base()?>json/update_paths/", { url: "<?php echo url::base().url::current() ?>" });
$.post("<?php echo url_lang::base()?>json/update_paths/", { url: "<?php echo url::base(TRUE).url::current() ?>" });
if ((history.length == 1 || history.length == 2) && document.referrer == "")
$.post("<?php echo url_lang::base()?>json/insert_path/");
freenetis/trunk/kohana/application/views/fees/add.php
<?php echo html::anchor(url_lang::base().'fees/show_all',url_lang::lang('texts.Back to list of all fees')) ?>
<br /><br />
<?php echo form::open(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form')) ?>
<?php echo form::open(url::base(TRUE).url::current(TRUE), '', 'POST', array('id' => 'article_form')) ?>
<table cellspacing="3" class="form">
<tr>
<th><?php echo form::label('type_id',url_lang::lang('texts.Type').':') ?></th>
freenetis/trunk/kohana/application/views/menu.php
<li class="administration"><h2><?php echo url_lang::lang('texts.Administration') ?></h2>
<ul>
<?php if ($this->acl_check_view('Settings_Controller', 'system')) { ?>
<li><?php echo html::anchor(url_lang::base().'settings/system', url_lang::lang('texts.Settings')) ?></li>
<li><?php echo html::anchor(url_lang::base().'settings/info', url_lang::lang('texts.Settings')) ?></li>
<?php } ?>
<?php if ($this->acl_check_view('Messages_Controller', 'message')) {?>
<li><?php echo html::anchor(url_lang::base().'messages/show_all', url_lang::lang('texts.Redirection')) ?></li>

Také k dispozici: Unified diff