Skip to content

O
OpnSense
Commit 69b290dd authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

opnsense: apply whitespace changes 

*runs for cover in fear of Ad's uncommited changes*
parent 368abf5d
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 31 deletions
src/opnsense/mvc/app/cache/_users_ad_develop_deciso_opnsense_gui_app_views_index.volt.php
View file @ 69b290dd
......@@ -6,4 +6,4 @@
<body>
<?php echo $this->getContent(); ?>
</body>
</html>
\ No newline at end of file
</html>
src/opnsense/mvc/app/cache/_users_ad_develop_deciso_opnsense_gui_app_views_index_index.volt.php
View file @ 69b290dd
<h1>Congratulations!</h1>
<p>You're now flying with Phalcon. Great things are about to happen!</p>
\ No newline at end of file
<p>You're now flying with Phalcon. Great things are about to happen!</p>
src/opnsense/mvc/app/controllers/IndexController.php
View file @ 69b290dd
......@@ -9,4 +9,3 @@ class IndexController extends ControllerBase
}
}
src/opnsense/mvc/app/models/OPNsense/CaptivePortal/ARP.php
View file @ 69b290dd
......@@ -109,4 +109,4 @@ class ARP
}
}
\ No newline at end of file
}
src/opnsense/mvc/app/models/OPNsense/CaptivePortal/DB.php
View file @ 69b290dd
......@@ -384,4 +384,4 @@ class DB {
}
\ No newline at end of file
}
src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Rules.php
View file @ 69b290dd
......@@ -318,4 +318,4 @@ class Rules {
file_put_contents($filename,$ruleset_txt);
}
}
\ No newline at end of file
}
src/opnsense/mvc/app/models/OPNsense/Core/Shell.php
View file @ 69b290dd
......@@ -123,4 +123,4 @@ class Shell
}
}
\ No newline at end of file
}
src/opnsense/mvc/app/views/index.volt
View file @ 69b290dd
......@@ -6,4 +6,4 @@
<body>
{{ content() }}
</body>
</html>
\ No newline at end of file
</html>
src/opnsense/mvc/app/views/index/index.volt
View file @ 69b290dd
<h1>Congratulations!</h1>
<p>You're now flying with Phalcon. Great things are about to happen!</p>
\ No newline at end of file
<p>You're now flying with Phalcon. Great things are about to happen!</p>
src/opnsense/mvc/script/test.php
View file @ 69b290dd
......@@ -36,8 +36,3 @@ print_r($acc_list);
//print_r($config->xpath('//pfsense/interfaces/*') );
//$rules= new \Core\Captiveportal\Rules();
src/opnsense/scripts/pkg_updatecheck.sh
View file @ 69b290dd
......@@ -74,9 +74,9 @@ if [ "$pkg_running" == "" ]; then
# Lets get coreversion first
core_version=`pkg info opnsense | grep 'Version' | awk -F '[:]' '{print $2}'` # Changed to reflect current installed core version
# Timeout loop for pkg update -f
while [ "$pkg_running" != "" ] && [ $timer -ne 0 ];
while [ "$pkg_running" != "" ] && [ $timer -ne 0 ];
do
sleep 1 # wait for 1 second
pkg_running=`ps -x | grep "pkg " | grep -v "grep"`
......@@ -94,7 +94,7 @@ if [ "$pkg_running" == "" ]; then
pkg_running="started" # Set running state to arbitrary value
# Timeout loop for pkg upgrade -n
while [ "$pkg_running" != "" ] && [ $timer -ne 0 ];
while [ "$pkg_running" != "" ] && [ $timer -ne 0 ];
do
sleep 1 # wait for 1 second
#pkg_running=`ps | grep 'pkg update -f' | grep -v 'grep' | tail -n 1 | awk -F '[ ]' '{print $1}'`
......@@ -109,7 +109,7 @@ if [ "$pkg_running" == "" ]; then
if [ "$repo_ok" == "" ]; then
# Repository can be used for updates
repository="ok"
updates=`cat $tmp_pkg_output_file | grep 'The following' | awk -F '[ ]' '{print $3}'`
updates=`cat $tmp_pkg_output_file | grep 'The following' | awk -F '[ ]' '{print $3}'`
if [ "$updates" == "" ]; then
# There are no updates
updates="0"
......@@ -131,7 +131,7 @@ if [ "$pkg_running" == "" ]; then
else
i=`echo $i | tr -d :`
#echo "name:$i"
if [ "$packages_new" == "" ]; then
if [ "$packages_new" == "" ]; then
packages_new=$packages_new"{\"name\":\"$i\"," # If it is the first item then we do not want a seperator
else
packages_new=$packages_new", {\"name\":\"$i\","
......@@ -157,7 +157,7 @@ if [ "$pkg_running" == "" ]; then
itemcount=0 # This is not a valid item so reset item count
else
i=`echo $i | tr -d :`
if [ "$packages_upgraded" == "" ]; then
if [ "$packages_upgraded" == "" ]; then
packages_upgraded=$packages_upgraded"{\"name\":\"$i\"," # If it is the first item then we do not want a seperator
else
packages_upgraded=$packages_upgraded", {\"name\":\"$i\","
......
src/opnsense/scripts/pkg_upgrade.sh
View file @ 69b290dd
......@@ -13,5 +13,3 @@ else
echo 'Upgrade already in progress'
echo '***DONE***'
fi
src/opnsense/service/conf/actions_filter.conf
View file @ 69b290dd
......@@ -21,4 +21,3 @@ command:/usr/local/etc/rc.filter_synchronize
parameters:
type:script
message:Syncing firewall
src/opnsense/service/conf/actions_interface.conf
View file @ 69b290dd
......@@ -57,4 +57,3 @@ command:/usr/local/etc/rc.carpbackup
parameters:%s
type:script
message:Carp backup event
src/opnsense/service/conf/actions_service.conf
View file @ 69b290dd
......@@ -70,5 +70,3 @@ command:/usr/local/etc/rc.savevoucher
parameters:
type:script
message:Synching vouchers
src/opnsense/service/conf/check_reload_status.conf
View file @ 69b290dd
[main]
socket_filename:/var/run/check_reload_status
pid_filename:/var/run/check_reload_status.pid
src/opnsense/service/execute_command.py
View file @ 69b290dd
......@@ -65,6 +65,3 @@ try:
print ('response:%s'% sock.recv(4096))
finally:
sock.close()
src/opnsense/service/modules/__init__.py
View file @ 69b290dd
......@@ -30,4 +30,4 @@
"""
\ No newline at end of file
"""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023