mvc: three more of those count() thingies

(cherry picked from commit 84a99758)

src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php

@@ -2,7 +2,6 @@
 
 /**
  *    Copyright (C) 2015 Deciso B.V.
- *
  *    All rights reserved.
  *
  *    Redistribution and use in source and binary forms, with or without
@@ -25,8 +24,8 @@
  *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *    POSSIBILITY OF SUCH DAMAGE.
- *
  */
+
 namespace OPNsense\Base;
 
 use OPNsense\Core\Config;
@@ -200,7 +199,7 @@ class ControllerBase extends ControllerRoot
         $this->view->menuSystem = $menu->getItems("/ui".$this->router->getRewriteUri());
 
         // set theme in ui_theme template var, let template handle its defaults (if there is no theme).
-        if ($cnf->object()->theme != null && !empty($cnf->object()->theme) &&
+        if ($cnf->object()->theme->count() > 0 && !empty($cnf->object()->theme) &&
             is_dir('/usr/local/opnsense/www/themes/'.(string)$cnf->object()->theme)
         ) {
             $this->view->ui_theme = $cnf->object()->theme;

src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php

 <?php
+
 /**
  *    Copyright (C) 2016 Deciso B.V.
- *
  *    All rights reserved.
  *
  *    Redistribution and use in source and binary forms, with or without
@@ -24,10 +24,8 @@
  *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *    POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
-
 namespace OPNsense\Diagnostics\Api;
 
 use \OPNsense\Base\ApiControllerBase;
@@ -45,7 +43,7 @@ class InterfaceController extends ApiControllerBase
         // collect interface names
         $intfmap = array();
         $config = Config::getInstance()->object();
-        if ($config->interfaces != null) {
+        if ($config->interfaces->count() > 0) {
             foreach ($config->interfaces->children() as $key => $node) {
                 $intfmap[(string)$node->if] = !empty((string)$node->descr) ? (string)$node->descr : $key;
             }

src/opnsense/mvc/app/models/OPNsense/Core/ACL.php

@@ -135,7 +135,7 @@ class ACL
 
         // gather user / group data from config.xml
         $config = Config::getInstance()->object();
-        if ($config->system != null) {
+        if ($config->system->count() > 0) {
             foreach ($config->system->children() as $key => $node) {
                 if ($key == 'user') {
                     $this->legacyUsers[$node->name->__toString()] = array();