From: Roland Haeder Date: Thu, 27 Aug 2015 00:52:42 +0000 (+0200) Subject: Removed code from importing it from 'hub' project (also a daemon). X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aa53f6f17d8a0d8ad9e53dc36cec387b9492f696;p=city.git Removed code from importing it from 'hub' project (also a daemon). Signed-off-by: Roland Haeder --- 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 @@ * @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 . */ -class ??? extends BaseFrameworkSystem implements === { +class ??? extends BaseCitySystem implements === { /** * Protected constructor *