From aa53f6f17d8a0d8ad9e53dc36cec387b9492f696 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 27 Aug 2015 02:52:42 +0200
Subject: [PATCH] Removed code from importing it from 'hub' project (also a
 daemon).

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 .../city_daemon/class_BaseCityDaemon.php        | 17 +----------------
 application/city/classes/class_                 |  4 ++--
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 8584beb..64fd872 100644
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -110,21 +110,6 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
 
 		// Add the City id
 		$criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_ID, $this->getCityId());
-
-		// Add the session id if acquired
-		if ($this->getSessionId() != '') {
-			$criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_SESSION_ID, $this->getSessionId());
-		} // END - if
-
-		// Add the private key if acquired
-		if ($this->getPrivateKey() != '') {
-			$criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_PRIVATE_KEY, base64_encode($this->getPrivateKey()));
-			$criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_PRIVATE_KEY_HASH, $this->getPrivateKeyHash());
-		} // END - if
-
-		// Add own external and internal addresses as UNLs
-		$criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_INTERNAL_UNL, CityTools::determineOwnInternalAddress());
-		$criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_EXTERNAL_UNL, CityTools::determineOwnExternalAddress());
 	}
 
 	/**
@@ -138,7 +123,7 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
 	 */
 	public function updateDatabaseField ($fieldName, $fieldValue) {
 		// Unfinished
-		$this->partialStub('Unfinished!');
+		$this->partialStub('Unfinished: fieldName=' . $fieldName . ',fieldValue=' . $fieldValue);
 		return;
 
 		// Get a critieria instance
diff --git a/application/city/classes/class_ b/application/city/classes/class_
index 2ebd875..5fbbc4e 100644
--- a/application/city/classes/class_
+++ b/application/city/classes/class_
@@ -1,6 +1,6 @@
 <?php
 /**
- * A ???
+ * A ??? city class
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class ??? extends BaseFrameworkSystem implements === {
+class ??? extends BaseCitySystem implements === {
 	/**
 	 * Protected constructor
 	 *
-- 
2.39.2