*/*: whitespace sweep

2026-05-22 18:44:07 -07:00 · 2018-07-14 11:25:46 +02:00
parent 365b586dd5
commit 4c85680e35
16 changed files with 27 additions and 30 deletions
@@ -9815,4 +9815,4 @@ h3 {
 #chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out {
  background-color: #FFF;
  border: 1px solid #c2c2c2;
-}
+}
@@ -5956,7 +5956,7 @@ main.page-content.col-lg-12 { padding-left: 90px; }
 	-webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
 	-moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);
 	box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);}
-  
+
 button.toggle-sidebar.glyphicon.glyphicon-chevron-left, button.toggle-sidebar.glyphicon.glyphicon-chevron-right{
 	position:absolute;
 	-webkit-transition: all 0.1s ease;
@@ -6320,7 +6320,7 @@ stroke: rgb(143, 143, 143) !important; }

 .tokenize > .tokens-container > .token > .dismiss::after {
 	color:#000 !important; }
-	
+
 .tokenize.focus > .tokens-container {
 	border-color: #00A7FF !important;
 	background-color:none !important;
@@ -6334,9 +6334,9 @@ stroke: rgb(143, 143, 143) !important; }
 .tokenize > .tokens-container > .tokenize > .tokens-container > .token-search {
 	color:#FFFFFF !important; }

-.tokenize > .tokens-container > .token-search > input { 
+.tokenize > .tokens-container > .token-search > input {
 	border:none !important;}
-	
+
 .bootgrid-table th > .column-header-anchor, .bootgrid-table th > .column-header-anchor > .icon, .bootgrid-table th > .column-header-anchor > .glyphicon {
 	color: #000 !important; }
 .bootgrid-table th:hover {
@@ -6373,4 +6373,4 @@ stroke: rgb(143, 143, 143) !important; }
 .glyphicon.glyphicon-play.text-muted, .glyphicon.glyphicon-remove.text-muted, .glyphicon.glyphicon-remove-sign.text-muted, .glyphicon.glyphicon-info-sign.text-muted, .fa.fa-play.text-muted::before {
 	color: #000 !important;}
 #system_log-widgets.content-box {border:none; box-shadow: none;}
-#chart,#chart_intf_in,#chart_intf_out,#chart_top_ports,#chart_top_sources,#traffic_graph_widget_chart_in,#traffic_graph_widget_chart_out { background-color: #FFF; border: 1px solid #c2c2c2; }
+#chart,#chart_intf_in,#chart_intf_out,#chart_top_ports,#chart_top_sources,#traffic_graph_widget_chart_in,#traffic_graph_widget_chart_out { background-color: #FFF; border: 1px solid #c2c2c2; }
@@ -20,4 +20,4 @@
 <p>The resource you want to access is not available.</p>
 <p>Please contact the webmaster if you think this is an error.</p>
 </body>
-</html>
+</html>
@@ -20,4 +20,4 @@
 <p>Sorry, but something went wrong on our side.</p>
 <p>There is nothing you can do except waiting until we fix the issue.</p>
 </body>
-</html>
+</html>
@@ -49,8 +49,8 @@ class ServiceController extends ApiMutableServiceControllerBase
    {
        return array('status' => 'failed');
    }
-    
-    
+
+
    /**
     * reconfigure with optional stop, generate config and start / reload
     * @return array response message
@@ -197,7 +197,7 @@ class SettingsController extends ApiMutableModelControllerBase
    {
        return $this->setBase('custompolicy', 'custom_policy', $uuid);
    }
-    
+
    // http server
    public function searchhttpserverAction()
    {
@@ -251,7 +251,7 @@ class SettingsController extends ApiMutableModelControllerBase
    {
        return $this->setBase('naxsi_rule', 'naxsi_rule', $uuid);
    }
-    
+
    // http url rewriting
    public function searchhttprewriteAction()
    {
@@ -28,4 +28,4 @@
        <style>selectpicker</style>
        <label>Action</label>
    </field>
-</form>
+</form>
@@ -322,7 +322,7 @@
        <Required>Y</Required>
      </name>
    </naxsi_rule>
-    
+
    <http_server type="ArrayField">
      <servername type="CSVListField">
        <Required>Y</Required>
@@ -417,7 +417,7 @@
        <Required>Y</Required>
      </sendfile>
    </http_server>
-    
+
    <http_rewrite type="ArrayField">
      <description type="TextField">
        <Required>Y</Required>
@@ -204,8 +204,8 @@ $( document ).ready(function() {
            </tfoot>
        </table>
    </div>
-    
-    
+
+
    <div id="subtab_nginx-http-upstream" class="tab-pane fade">
        <table id="grid-upstream" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="upstreamdlg">
            <thead>
@@ -380,4 +380,3 @@ $( document ).ready(function() {
 {{ partial("layout_partials/base_dialog",['fields': httprewrite,'id':'httprewritedlg', 'label':lang._('Edit URL Rewrite')]) }}
 {{ partial("layout_partials/base_dialog",['fields': naxsi_custom_policy,'id':'custompolicydlg', 'label':lang._('Edit WAF Policy')]) }}
 {{ partial("layout_partials/base_dialog",['fields': naxsi_rule,'id':'naxsiruledlg', 'label':lang._('Edit Naxsi Rule')]) }}
-
@@ -69,9 +69,9 @@ foreach ($http_servers as $http_server) {
      foreach ($http_server['ca'] as $caref) {
        $ca = find_ca($caref);
        if (isset($ca)) {
-          export_pem_file(                                                          
-            '/usr/local/etc/nginx/key/' . $hostname . '_ca.pem',                       
-            $ca['crt']                                                            
+          export_pem_file(
+            '/usr/local/etc/nginx/key/' . $hostname . '_ca.pem',
+            $ca['crt']
          );
        }
      }
@@ -103,4 +103,3 @@ foreach ($nginx->userlist->__items as $user_list) {
        unset($file);
    }
 }
-
@@ -36,10 +36,10 @@ keepalive_timeout {{ OPNsense.Nginx.http.keepalive_timeout }};

 # TODO add when core is ready for allowing nginx to serve the web interface
 # include nginx_web.conf;
-    
+
 {% include "OPNsense/Nginx/upstream.conf" ignore missing with context %}

-{%   set listen_list = [] %} 
+{%   set listen_list = [] %}
 {% for server in helpers.toList('OPNsense.Nginx.http_server') %}
 {%   set single_servername = server.servername.split(",")[0] %}
 server {
@@ -59,4 +59,4 @@
 {% endif %}
 {% if naxsi_ruletype == 'main' %}
 {{   naxsi_rule(custom_policy_uuid, main_rule, "MainRule") }}
-{% endif %}
+{% endif %}
@@ -27,4 +27,3 @@ http {
 {%   include "OPNsense/Nginx/mail.conf" ignore missing with context %}
 # }
 {% endif %}
-
@@ -26,4 +26,4 @@
 {%       endfor %}
 {%     endif %}
 {%   endfor %}
-{% endif %}
+{% endif %}
@@ -9,7 +9,7 @@
 {%   for upstream_serveruuid in upstream.serverentries.split(',') %}
 upstream upstream{{ upstream_uuid.replace('-','') }} {
 {%     set upstream_server = helpers.getUUID(upstream_serveruuid) %}
-server {% if ':' in upstream_server.server %}[{% endif %}{{ upstream_server.server }}{% if ':' in upstream_server.server %}]{% endif 
+server {% if ':' in upstream_server.server %}[{% endif %}{{ upstream_server.server }}{% if ':' in upstream_server.server %}]{% endif
       %}{% if upstream_server.port is defined %}:{{ upstream_server.port }}{% endif
       %}{% if upstream_server.priority is defined %} weight={{ upstream_server.priority }}{% endif
       %}{% if upstream_server.max_conns is defined %} max_conns={{ upstream_server.max_conns }}{% endif
@@ -181,7 +181,7 @@ server {
    fastcgi_param TLS-Protocol $ssl_protocol;
    fastcgi_param TLS-SNI-Host $ssl_server_name;
    fastcgi_intercept_errors off;
-    fastcgi_pass   unix:/var/run/php-webgui.socket; 
+    fastcgi_pass   unix:/var/run/php-webgui.socket;
  }
  location @guirequest {
    root /usr/local/opnsense/www;
@@ -192,7 +192,7 @@ server {
    fastcgi_param TLS-Protocol $ssl_protocol;
    fastcgi_param TLS-SNI-Host $ssl_server_name;
    fastcgi_intercept_errors off;
-    fastcgi_pass   unix:/var/run/php-webgui.socket; 
+    fastcgi_pass   unix:/var/run/php-webgui.socket;
  }
  location ~ ^/ui/(?<path>[^\?]+)(?<query>\?(.*))? {
    root /usr/local/opnsense/www;