Fix merge conflict from dev.

code_igniter/application/config/config.php

@@ -2,8 +2,8 @@
 if (! defined('BASEPATH')) {
     exit('No direct script access allowed');
 }
-$config['web_internal_version'] = '20180810';
-$config['web_display_version'] = '2.2.7';
+$config['web_internal_version'] = '20180925';
+$config['web_display_version'] = '2.3.0';
 # $config['debug'] = false;
 /*
 |--------------------------------------------------------------------------

code_igniter/application/controllers/agents.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/applications.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/attributes.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/buildings.php

@@ -0,0 +1,186 @@
+<?php
+/**
+#  Copyright 2003-2015 Opmantek Limited (www.opmantek.com)
+#
+#  ALL CODE MODIFICATIONS MUST BE SENT TO [email protected]
+#
+#  This file is part of Open-AudIT.
+#
+#  Open-AudIT is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU Affero General Public License as published
+#  by the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  Open-AudIT is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU Affero General Public License for more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Open-AudIT (most likely in a file named LICENSE).
+#  If not, see <http://www.gnu.org/licenses/>
+#
+#  For further information on Open-AudIT or for a license other than AGPL please see
+#  www.opmantek.com or email [email protected]
+#
+# *****************************************************************************
+*
+* @category  Controller
+* @package   Open-AudIT
+* @author    Mark Unwin <[email protected]>
+* @copyright 2014 Opmantek
+* @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
+* @version   2.3.0
+* @link      http://www.open-audit.org
+*/
+
+/**
+* Base Object Buildings
+*
+* @access   public
+* @category Object
+* @package  Open-AudIT
+* @author   Mark Unwin <[email protected]>
+* @license  http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
+* @link     http://www.open-audit.org
+ */
+class buildings extends MY_Controller
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->load->model('m_buildings');
+        inputRead();
+        $this->output->url = $this->config->item('oa_web_index');
+    }
+
+    public function index()
+    {
+    }
+
+    /**
+    * Our remap function to override the inbuilt controller->method functionality
+    *
+    * @access public
+    * @return NULL
+    */
+    public function _remap()
+    {
+        $this->{$this->response->meta->action}();
+    }
+
+    /**
+    * Process the supplied data and create a new object
+    *
+    * @access public
+    * @return NULL
+    */
+    private function create()
+    {
+        include 'include_create.php';
+    }
+
+    /**
+    * Read a single object
+    *
+    * @access public
+    * @return NULL
+    */
+    private function read()
+    {
+        include 'include_read.php';
+    }
+
+    /**
+    * Process the supplied data and update an existing object
+    *
+    * @access public
+    * @return NULL
+    */
+    public function update()
+    {
+        include 'include_update.php';
+    }
+
+    /**
+    * Delete an existing object
+    *
+    * @access public
+    * @return NULL
+    */
+    public function delete()
+    {
+        include 'include_delete.php';
+    }
+
+    /**
+    * Collection of objects
+    *
+    * @access public
+    * @return NULL
+    */
+    public function collection()
+    {
+        include 'include_collection.php';
+    }
+
+    /**
+    * Supply a HTML form for the user to create an object
+    *
+    * @access public
+    * @return NULL
+    */
+    private function create_form()
+    {
+        include 'include_create_form.php';
+    }
+
+    /**
+    * Supply a HTML form for the user to update an object
+    *
+    * @access public
+    * @return NULL
+    */
+    private function update_form()
+    {
+        include 'include_update_form.php';
+    }
+
+    /**
+    * Supply a HTML form for the user to upload a collection of objects in CSV
+    *
+    * @access public
+    * @return NULL
+    */
+    public function import_form()
+    {
+        $this->load->model('m_database');
+        $this->response->data = $this->m_database->read('agents');
+        include 'include_import_form.php';
+    }
+
+    /**
+    * Process the supplied data and create a new object
+    *
+    * @access public
+    * @return NULL
+    */
+    public function import()
+    {
+        include 'include_import.php';
+    }
+
+    /**
+    * The requested table will have optimize arun upon it and it's autoincrement reset to 1
+    *
+    * @access public
+    * @return NULL
+    */
+    public function reset()
+    {
+        include 'include_reset.php';
+    }
+
+}
+// End of file buildings.php
+// Location: ./controllers/buildings.php

code_igniter/application/controllers/charts.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/clouds.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/collectors.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/configuration.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/connections.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/credentials.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/custom.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/dashboards.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 

code_igniter/application/controllers/database.php

@@ -30,7 +30,7 @@
 * @author    Mark Unwin <[email protected]>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.2.7
+* @version   2.3.0
 * @link      http://www.open-audit.org
 */
 
@@ -746,6 +746,11 @@ public function update()
             include "db_upgrades/db_2.2.7.php";
         }
 
+        if (($db_internal_version < '20180925') and ($this->db->platform() == 'mysql')) {
+            # upgrade for 2.3.0
+            include "db_upgrades/db_2.3.0.php";
+        }
+
         $this->data['include'] = 'v_database_update';
         $this->data['heading'] = 'Database Upgrade';
         $this->data['success'] = "Database upgraded successfully. New database version is ".$this->config->config['display_version']." (".$this->config->config['internal_version'].")";