src: fix all the whitespaces!

This commit is contained in:
Franco Fichtner 2015-02-27 14:50:16 +01:00
parent 14b71e383c
commit 931efa6867
8 changed files with 12 additions and 21 deletions

View File

@ -241,7 +241,7 @@ function captiveportal_init_rules($reinit = false) {
$cpc = new OPNsense\CaptivePortal\CPClient();
if ($cpc->isEnabled()) {
// load modules ( only if CP is enabled )
captiveportal_load_modules();
captiveportal_load_modules();
}
$cpc->reconfigure();
unset($cpc);

View File

@ -78,7 +78,7 @@ openlog("openvpn", LOG_ODELAY, LOG_AUTH);
if (count($argv) > 6) {
$authmodes = explode(',', $argv[5]);
$username = base64_decode(str_replace('%3D', '=', $argv[1]));
$password = base64_decode(str_replace('%3D', '=', $argv[2]));
$password = base64_decode(str_replace('%3D', '=', $argv[2]));
$common_name = $argv[3];
$modeid = $argv[6];
$strictusercn = $argv[4] == 'false' ? false : true;

View File

@ -91,7 +91,7 @@ function carp_check_version($url, $username, $password, $port = 80, $method = 'p
global $config, $g;
if(file_exists("/var/run/booting") {
return;
return;
}
$params = array(
@ -142,7 +142,7 @@ function carp_sync_xml($url, $username, $password, $sections, $port = 80, $metho
global $config, $g;
if(file_exists("/var/run/booting") {
return;
return;
}
update_filter_reload_status("Syncing CARP data to {$url}");

View File

@ -23,7 +23,7 @@ if [ -n "${*}" ]; then
/bin/csh "${@}"
exit ${?}
fi
# endless loop
while : ; do

View File

@ -62,9 +62,3 @@ else:
print (''.join(data))
finally:
sock.close()

View File

@ -73,6 +73,3 @@ try:
print ('response:%s'% ''.join(data) )
finally:
sock.close()

View File

@ -1 +1 @@
squid_enable=YES
squid_enable=YES

View File

@ -244,7 +244,7 @@ $main_buttons = array(
$alias_popup = rule_popup($natent['source']['address'], pprint_port($natent['source']['port']), $natent['destination']['address'], pprint_port($natent['destination']['port']));
$alias_popup = rule_popup($natent['source']['address'], pprint_port($natent['source']['port']), $natent['destination']['address'], pprint_port($natent['destination']['port']));
$alias_src_span_begin = $alias_popup["src"];
$alias_src_port_span_begin = $alias_popup["srcport"];
@ -303,7 +303,7 @@ $main_buttons = array(
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?>
<?php
<?php
if ($alias_src_span_begin) echo htmlspecialchars(pprint_address($alias_src_span_begin));
else echo htmlspecialchars(pprint_address($natent['source']));
if ($alias_src_span_end) echo htmlspecialchars(pprint_address($alias_src_span_end));
@ -312,7 +312,7 @@ $main_buttons = array(
</td>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?>
<?php
<?php
if ($alias_src_port_span_begin) echo htmlspecialchars(pprint_port($alias_src_port_span_begin));
else echo htmlspecialchars(pprint_port($natent['source']['port']));
if($alias_src_port_span_end) echo htmlspecialchars(pprint_port($alias_src_port_span_end));
@ -321,7 +321,7 @@ $main_buttons = array(
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?>
<?php
<?php
if ($alias_dst_span_begin) echo htmlspecialchars(pprint_address($alias_dst_span_begin));
else echo htmlspecialchars(pprint_address($natent['destination']));
if ($alias_dst_span_end) echo htmlspecialchars(pprint_address($alias_dst_span_end));
@ -338,7 +338,7 @@ $main_buttons = array(
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?>
<?php
<?php
if ($alias_target_span_begin) echo htmlspecialchars(pprint_address($alias_target_span_begin));
else echo htmlspecialchars($natent['target']);
if ($alias_target_span_end) echo htmlspecialchars(pprint_address($alias_target_span_end));
@ -355,7 +355,7 @@ $main_buttons = array(
$localport .= '-' . $localendport;
}
?>
<?=$textss;?><?php
<?=$textss;?><?php
if ($alias_local_port_span_begin) echo htmlspecialchars(pprint_port($alias_local_port_span_begin['address']));
else echo htmlspecialchars(pprint_port($localport));
if ($alias_local_port_span_end) echo htmlspecialchars(pprint_port($alias_local_port_span_end['address']));