From: Roland Haeder Date: Wed, 26 Oct 2016 23:41:01 +0000 (+0200) Subject: Some updates: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git Some updates: - inc/config/config-local.php is no longer supported as it requires a (mostly) application-specific file being placed into core which is not a good idea. Better is strict separation of core-specific (framework only) and application-specific. - updated all file's copyright year to 2016 - added dummy for upcoming datbase migration support (later also between different engines, if possible?) Signed-off-by: Roland Haeder --- diff --git a/application/tests/data.php b/application/tests/data.php new file mode 100644 index 00000000..36175015 --- /dev/null +++ b/application/tests/data.php @@ -0,0 +1,43 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Get config instance +$cfg = FrameworkConfiguration::getSelfInstance(); + +// Get an instance of the helper +$app = call_user_func_array( + array($cfg->getConfigEntry('app_helper_class'), 'getSelfInstance'), + array() +); + +// Set application name and version +$app->setAppName('Unit tests and more'); +$app->setAppVersion('0.0.0'); +$app->setAppShortName('tests'); + +// [EOF] +?> diff --git a/application/tests/init.php b/application/tests/init.php new file mode 100644 index 00000000..256eb561 --- /dev/null +++ b/application/tests/init.php @@ -0,0 +1,31 @@ + + * @version 0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Get config instance +$cfg = FrameworkConfiguration::getSelfInstance(); + +// [EOF] +?> diff --git a/application/tests/loader.php b/application/tests/loader.php new file mode 100644 index 00000000..be84b026 --- /dev/null +++ b/application/tests/loader.php @@ -0,0 +1,28 @@ + + * @version 0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Scan for application's classes, exceptions and interfaces +ClassLoader::scanApplicationClasses(); + +// [EOF] +?> diff --git a/application/tests/starter.php b/application/tests/starter.php new file mode 100644 index 00000000..bb6a79df --- /dev/null +++ b/application/tests/starter.php @@ -0,0 +1,57 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Is there an application helper instance? We need the method main() for +// maining the application +$app = call_user_func_array( + array( + FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), 'getSelfInstance' + ), array() +); + +// Some sanity checks +if ((empty($app)) || (is_null($app))) { + // Something went wrong! + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.", + $application, + FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class') + )); +} elseif (!is_object($app)) { + // No object! + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.", + $application + )); +} elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) { + // Method not found! + ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the method %s is missing.", + $application, + FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method') + )); +} + +// Call user function +call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); + +// [EOF] +?> diff --git a/framework/loader/class_ClassLoader.php b/framework/loader/class_ClassLoader.php index fab4e559..3fd420fa 100644 --- a/framework/loader/class_ClassLoader.php +++ b/framework/loader/class_ClassLoader.php @@ -16,8 +16,13 @@ use \SplFileInfo; * This class loads class include files with a specific prefix and suffix * * @author Roland Haeder +<<<<<<< HEAD:framework/loader/class_ClassLoader.php * @version 1.5.0 * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/loader/class_ClassLoader.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/actions/class_ b/framework/main/classes/actions/class_ index 786e8349..a5d9364c 100644 --- a/framework/main/classes/actions/class_ +++ b/framework/main/classes/actions/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Action\BaseAction; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/actions/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/actions/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/actions/class_BaseAction.php b/framework/main/classes/actions/class_BaseAction.php index 4205c9ea..e8fdaf99 100644 --- a/framework/main/classes/actions/class_BaseAction.php +++ b/framework/main/classes/actions/class_BaseAction.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/actions/class_BaseAction.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/actions/class_BaseAction.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php index 44e9c5ef..7430f562 100644 --- a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php +++ b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/actions/html/class_HtmlLoginProfileAction.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/actions/html/class_HtmlLoginProfileAction.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php index 0903d931..061617c6 100644 --- a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php +++ b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/application/class_BaseApplication.php b/framework/main/classes/application/class_BaseApplication.php index d4c37398..e18a620c 100644 --- a/framework/main/classes/application/class_BaseApplication.php +++ b/framework/main/classes/application/class_BaseApplication.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/application/class_BaseApplication.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/application/class_BaseApplication.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/auth/class_CookieAuth.php b/framework/main/classes/auth/class_CookieAuth.php index 6cd6559a..0652bb17 100644 --- a/framework/main/classes/auth/class_CookieAuth.php +++ b/framework/main/classes/auth/class_CookieAuth.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/auth/class_CookieAuth.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/auth/class_CookieAuth.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/cache/class_MemoryCache.php b/framework/main/classes/cache/class_MemoryCache.php index 8762a34d..ee5cf263 100644 --- a/framework/main/classes/cache/class_MemoryCache.php +++ b/framework/main/classes/cache/class_MemoryCache.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/cache/class_MemoryCache.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/cache/class_MemoryCache.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Rename to InProgressCache diff --git a/framework/main/classes/class_ b/framework/main/classes/class_ index a6c0d3ba..a2afb21a 100644 --- a/framework/main/classes/class_ +++ b/framework/main/classes/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/class_Base b/framework/main/classes/class_Base index fa836345..b2eb7bf5 100644 --- a/framework/main/classes/class_Base +++ b/framework/main/classes/class_Base @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/class_Base * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/class_Base * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index 73ce1b18..e015b575 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -61,7 +61,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/class_BaseFrameworkSystem.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/class_BaseFrameworkSystem.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/class_FrameworkArrayObject.php b/framework/main/classes/class_FrameworkArrayObject.php index a75c861a..8d68eaba 100644 --- a/framework/main/classes/class_FrameworkArrayObject.php +++ b/framework/main/classes/class_FrameworkArrayObject.php @@ -12,7 +12,11 @@ use \ArrayObject; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/class_FrameworkArrayObject.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/class_FrameworkArrayObject.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/client/class_ b/framework/main/classes/client/class_ index 363cc00a..cc14e154 100644 --- a/framework/main/classes/client/class_ +++ b/framework/main/classes/client/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/client/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/client/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/client/class_BaseClient.php b/framework/main/classes/client/class_BaseClient.php index 72f9f253..79333d5c 100644 --- a/framework/main/classes/client/class_BaseClient.php +++ b/framework/main/classes/client/class_BaseClient.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/client/class_BaseClient.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/client/class_BaseClient.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/commands/class_ b/framework/main/classes/commands/class_ index 40181f41..cf8c6baf 100644 --- a/framework/main/classes/commands/class_ +++ b/framework/main/classes/commands/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/commands/class_BaseCommand.php b/framework/main/classes/commands/class_BaseCommand.php index 9787fb0b..b6694988 100644 --- a/framework/main/classes/commands/class_BaseCommand.php +++ b/framework/main/classes/commands/class_BaseCommand.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/class_BaseCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/class_BaseCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/console/class_Console b/framework/main/classes/commands/console/class_Console index 55ca37ce..d7be8346 100644 --- a/framework/main/classes/commands/console/class_Console +++ b/framework/main/classes/commands/console/class_Console @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/console/class_Console * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/console/class_Console * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php index 3744c1cf..2d645245 100644 --- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php +++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/console/class_ConsoleFuseCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/console/class_ConsoleFuseCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/commands/html/class_Html b/framework/main/classes/commands/html/class_Html index 917c94cf..cbe3fa47 100644 --- a/framework/main/classes/commands/html/class_Html +++ b/framework/main/classes/commands/html/class_Html @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_Html * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_Html * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php index 33a654fc..689ece38 100644 --- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php +++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php @@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlConfirmCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlConfirmCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php index d844e3e5..4d681500 100644 --- a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php +++ b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlDoFormCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlDoFormCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlHomeCommand.php b/framework/main/classes/commands/html/class_HtmlHomeCommand.php index e8bb81d0..dff305b7 100644 --- a/framework/main/classes/commands/html/class_HtmlHomeCommand.php +++ b/framework/main/classes/commands/html/class_HtmlHomeCommand.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlHomeCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlHomeCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php index 8d99f415..728fcddb 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php @@ -18,7 +18,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlLoginCommand.php b/framework/main/classes/commands/html/class_HtmlLoginCommand.php index d3df3f3e..b7006730 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginCommand.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLoginCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php index 6a574d1b..6b299c35 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php index 1270fa37..b8471401 100644 --- a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLogoutCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php index 361c9599..7a7a281d 100644 --- a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlProblemCommand.php b/framework/main/classes/commands/html/class_HtmlProblemCommand.php index d2ae2e33..0abf7e2f 100644 --- a/framework/main/classes/commands/html/class_HtmlProblemCommand.php +++ b/framework/main/classes/commands/html/class_HtmlProblemCommand.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlProblemCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlProblemCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php index b0088af6..92c3efad 100644 --- a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php +++ b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlRegisterCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlRegisterCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php index 62dd1fd9..e4ea48aa 100644 --- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php +++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php @@ -18,7 +18,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlResendLinkCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlResendLinkCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/html/class_HtmlStatusCommand.php b/framework/main/classes/commands/html/class_HtmlStatusCommand.php index 467c3622..429e3719 100644 --- a/framework/main/classes/commands/html/class_HtmlStatusCommand.php +++ b/framework/main/classes/commands/html/class_HtmlStatusCommand.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlStatusCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlStatusCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php index b9e2c2f9..ef36945c 100644 --- a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php +++ b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/compressor/class_Bzip2Compressor.php b/framework/main/classes/compressor/class_Bzip2Compressor.php index bf19554a..71d35e26 100644 --- a/framework/main/classes/compressor/class_Bzip2Compressor.php +++ b/framework/main/classes/compressor/class_Bzip2Compressor.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/compressor/class_Bzip2Compressor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/compressor/class_Bzip2Compressor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/compressor/class_GzipCompressor.php b/framework/main/classes/compressor/class_GzipCompressor.php index 3163c9e7..41792611 100644 --- a/framework/main/classes/compressor/class_GzipCompressor.php +++ b/framework/main/classes/compressor/class_GzipCompressor.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/compressor/class_GzipCompressor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/compressor/class_GzipCompressor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/compressor/class_NullCompressor.php b/framework/main/classes/compressor/class_NullCompressor.php index 3bc22cc8..50722313 100644 --- a/framework/main/classes/compressor/class_NullCompressor.php +++ b/framework/main/classes/compressor/class_NullCompressor.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/compressor/class_NullCompressor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/compressor/class_NullCompressor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/compressor/class_ZlibCompressor.php b/framework/main/classes/compressor/class_ZlibCompressor.php index 8992b4c3..690668e2 100644 --- a/framework/main/classes/compressor/class_ZlibCompressor.php +++ b/framework/main/classes/compressor/class_ZlibCompressor.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/compressor/class_ZlibCompressor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/compressor/class_ZlibCompressor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/container/class_ b/framework/main/classes/container/class_ index c3bf332e..82fd6738 100644 --- a/framework/main/classes/container/class_ +++ b/framework/main/classes/container/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/container/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/container/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/container/class_BaseContainer.php b/framework/main/classes/container/class_BaseContainer.php index b55c5b4d..4b9da382 100644 --- a/framework/main/classes/container/class_BaseContainer.php +++ b/framework/main/classes/container/class_BaseContainer.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/container/class_BaseContainer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/container/class_BaseContainer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/class_ b/framework/main/classes/controller/class_ index 79c7a596..75be2d3d 100644 --- a/framework/main/classes/controller/class_ +++ b/framework/main/classes/controller/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php index b9f59327..729f51e1 100644 --- a/framework/main/classes/controller/class_BaseController.php +++ b/framework/main/classes/controller/class_BaseController.php @@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/class_BaseController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/class_BaseController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultController.php b/framework/main/classes/controller/console/class_ConsoleDefaultController.php index 4157c72a..dc091878 100644 --- a/framework/main/classes/controller/console/class_ConsoleDefaultController.php +++ b/framework/main/classes/controller/console/class_ConsoleDefaultController.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/console/class_ConsoleDefaultController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/console/class_ConsoleDefaultController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This controller shall still provide some headlines for sidebars diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php index c8870c8b..adc8ca8e 100644 --- a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php +++ b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_Html b/framework/main/classes/controller/html/class_Html index dbecaee8..06bc37cf 100644 --- a/framework/main/classes/controller/html/class_Html +++ b/framework/main/classes/controller/html/class_Html @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_Html * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_Html * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/controller/html/class_HtmlConfirmController.php b/framework/main/classes/controller/html/class_HtmlConfirmController.php index fc82cccb..c9d5c184 100644 --- a/framework/main/classes/controller/html/class_HtmlConfirmController.php +++ b/framework/main/classes/controller/html/class_HtmlConfirmController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlConfirmController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlConfirmController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_HtmlDefaultController.php b/framework/main/classes/controller/html/class_HtmlDefaultController.php index c2e579da..55f6b1a7 100644 --- a/framework/main/classes/controller/html/class_HtmlDefaultController.php +++ b/framework/main/classes/controller/html/class_HtmlDefaultController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlDefaultController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlDefaultController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This controller shall still provide some headlines for sidebars diff --git a/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php b/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php index 96cdf2d3..6806dd89 100644 --- a/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php +++ b/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlDefaultNewsController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlDefaultNewsController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_HtmlLoginController.php b/framework/main/classes/controller/html/class_HtmlLoginController.php index d643b9dd..5170d4ca 100644 --- a/framework/main/classes/controller/html/class_HtmlLoginController.php +++ b/framework/main/classes/controller/html/class_HtmlLoginController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLoginController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLoginController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_HtmlLoginFailedController.php b/framework/main/classes/controller/html/class_HtmlLoginFailedController.php index 696f3b1d..6b941967 100644 --- a/framework/main/classes/controller/html/class_HtmlLoginFailedController.php +++ b/framework/main/classes/controller/html/class_HtmlLoginFailedController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLoginFailedController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLoginFailedController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_HtmlLogoutController.php b/framework/main/classes/controller/html/class_HtmlLogoutController.php index 59399733..4d2c7822 100644 --- a/framework/main/classes/controller/html/class_HtmlLogoutController.php +++ b/framework/main/classes/controller/html/class_HtmlLogoutController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLogoutController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This controller shall still provide some headlines for sidebars diff --git a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php index 484a5bdc..f906a76c 100644 --- a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php +++ b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutDoneController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLogoutDoneController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_HtmlRegisterController.php b/framework/main/classes/controller/html/class_HtmlRegisterController.php index 6f2a36f1..64d289a8 100644 --- a/framework/main/classes/controller/html/class_HtmlRegisterController.php +++ b/framework/main/classes/controller/html/class_HtmlRegisterController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlRegisterController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlRegisterController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/class_HtmlStatusController.php b/framework/main/classes/controller/html/class_HtmlStatusController.php index eb5c5ab6..9b82d4cf 100644 --- a/framework/main/classes/controller/html/class_HtmlStatusController.php +++ b/framework/main/classes/controller/html/class_HtmlStatusController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlStatusController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlStatusController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This controller shall still provide some headlines for sidebars diff --git a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php index fad03b89..f4a4479c 100644 --- a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php +++ b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/form/class_HtmlDoFormController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/form/class_HtmlDoFormController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php index 9466de75..761ab386 100644 --- a/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php +++ b/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php index 522aef85..cb98da01 100644 --- a/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php +++ b/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/controller/image/class_ImageDefaultController.php b/framework/main/classes/controller/image/class_ImageDefaultController.php index 7dc1bbda..1178684f 100644 --- a/framework/main/classes/controller/image/class_ImageDefaultController.php +++ b/framework/main/classes/controller/image/class_ImageDefaultController.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/controller/image/class_ImageDefaultController.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/controller/image/class_ImageDefaultController.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/criteria/class_BaseCriteria.php b/framework/main/classes/criteria/class_BaseCriteria.php index e9f9a853..4452760a 100644 --- a/framework/main/classes/criteria/class_BaseCriteria.php +++ b/framework/main/classes/criteria/class_BaseCriteria.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/criteria/class_BaseCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/criteria/class_BaseCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php index f443623e..ed36dd36 100644 --- a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php +++ b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/criteria/dataset/class_DataSetCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/criteria/dataset/class_DataSetCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/criteria/search/class_SearchCriteria.php b/framework/main/classes/criteria/search/class_SearchCriteria.php index 7ab52f40..db6a2526 100644 --- a/framework/main/classes/criteria/search/class_SearchCriteria.php +++ b/framework/main/classes/criteria/search/class_SearchCriteria.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/criteria/search/class_SearchCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/criteria/search/class_SearchCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/criteria/update/class_UpdateCriteria.php b/framework/main/classes/criteria/update/class_UpdateCriteria.php index 1d9d1e95..cec42687 100644 --- a/framework/main/classes/criteria/update/class_UpdateCriteria.php +++ b/framework/main/classes/criteria/update/class_UpdateCriteria.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/criteria/update/class_UpdateCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/criteria/update/class_UpdateCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/crypto/class_CryptoHelper.php b/framework/main/classes/crypto/class_CryptoHelper.php index 1bf22a34..830c23cc 100644 --- a/framework/main/classes/crypto/class_CryptoHelper.php +++ b/framework/main/classes/crypto/class_CryptoHelper.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/crypto/class_CryptoHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/crypto/class_CryptoHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php index dd8c3356..2933d57c 100644 --- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php +++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php @@ -26,7 +26,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/backend/class_CachedLocalFileDatabase.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/database/class_ b/framework/main/classes/database/class_ index 1e6e7a3e..1a8bf5fd 100644 --- a/framework/main/classes/database/class_ +++ b/framework/main/classes/database/class_ @@ -5,7 +5,11 @@ * @see DatabaseBackendInterface - An interface for database backends * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/database/class_BaseDatabaseBackend.php b/framework/main/classes/database/class_BaseDatabaseBackend.php index 025a9879..ad33fae1 100644 --- a/framework/main/classes/database/class_BaseDatabaseBackend.php +++ b/framework/main/classes/database/class_BaseDatabaseBackend.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * @see DatabaseBackend - An interface for database backends * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseBackend.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/class_BaseDatabaseBackend.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/database/class_BaseDatabaseResult.php b/framework/main/classes/database/class_BaseDatabaseResult.php index e0f9a950..5a78394a 100644 --- a/framework/main/classes/database/class_BaseDatabaseResult.php +++ b/framework/main/classes/database/class_BaseDatabaseResult.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * @see DatabaseBackend - An interface for database backends * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseResult.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/class_BaseDatabaseResult.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php index d8b47b58..ea4f3402 100644 --- a/framework/main/classes/database/class_BaseDatabaseWrapper.php +++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/class_BaseDatabaseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php index 88b98cbd..20874d8a 100644 --- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php +++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Add missing own interface for public methods diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php index 116e474d..afd49a54 100644 --- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php +++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Add missing own interface for public methods diff --git a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php index 9ed16737..59e2c376 100644 --- a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php +++ b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Wrapper\Account\ManageableAccountWrapper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserDatabaseWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/frontend/class_UserDatabaseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php index d9242d8a..affde5b0 100644 --- a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php +++ b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php index 6c36cdc0..4064f21a 100644 --- a/framework/main/classes/database/result/class_CachedDatabaseResult.php +++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php @@ -19,7 +19,11 @@ use \SeekableIterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/database/result/class_CachedDatabaseResult.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/database/result/class_CachedDatabaseResult.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/decorator/class_BaseDecorator.php b/framework/main/classes/decorator/class_BaseDecorator.php index 5ab0019c..e8f5ae23 100644 --- a/framework/main/classes/decorator/class_BaseDecorator.php +++ b/framework/main/classes/decorator/class_BaseDecorator.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/decorator/class_BaseDecorator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/decorator/class_BaseDecorator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php index 4325fffc..46ac2c5c 100644 --- a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php +++ b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php index bf35ecce..f5b4a407 100644 --- a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php +++ b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Parser\Parseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/discovery/class_ b/framework/main/classes/discovery/class_ index f33d64f0..baf610f9 100644 --- a/framework/main/classes/discovery/class_ +++ b/framework/main/classes/discovery/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/discovery/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/discovery/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/discovery/class_BaseDiscovery.php b/framework/main/classes/discovery/class_BaseDiscovery.php index 2b175c0d..1a812b03 100644 --- a/framework/main/classes/discovery/class_BaseDiscovery.php +++ b/framework/main/classes/discovery/class_BaseDiscovery.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/discovery/class_BaseDiscovery.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/discovery/class_BaseDiscovery.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php index 79d2da41..8e314580 100644 --- a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php +++ b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php @@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/cache/class_CacheFactory.php b/framework/main/classes/factories/cache/class_CacheFactory.php index a3207449..028bf4f4 100644 --- a/framework/main/classes/factories/cache/class_CacheFactory.php +++ b/framework/main/classes/factories/cache/class_CacheFactory.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/cache/class_CacheFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/cache/class_CacheFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/class_ b/framework/main/classes/factories/class_ index 9c9ab026..60182743 100644 --- a/framework/main/classes/factories/class_ +++ b/framework/main/classes/factories/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/class_BaseFactory.php b/framework/main/classes/factories/class_BaseFactory.php index 103d9215..fd76f21c 100644 --- a/framework/main/classes/factories/class_BaseFactory.php +++ b/framework/main/classes/factories/class_BaseFactory.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/class_BaseFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/class_BaseFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php b/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php index c272f751..c082070e 100644 --- a/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php +++ b/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/database/class_DatabaseWrapperFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/database/class_DatabaseWrapperFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/html/class_HtmlNewsFactory.php b/framework/main/classes/factories/html/class_HtmlNewsFactory.php index 880606a1..062d6755 100644 --- a/framework/main/classes/factories/html/class_HtmlNewsFactory.php +++ b/framework/main/classes/factories/html/class_HtmlNewsFactory.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/html/class_HtmlNewsFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/html/class_HtmlNewsFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php index 8d366c0e..0f7ffa3e 100644 --- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php +++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php @@ -15,7 +15,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/index/class_FileStackIndexFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/index/class_FileStackIndexFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/factories/logger/class_LoggerFactory.php b/framework/main/classes/factories/logger/class_LoggerFactory.php index 952d14c4..a0099eff 100644 --- a/framework/main/classes/factories/logger/class_LoggerFactory.php +++ b/framework/main/classes/factories/logger/class_LoggerFactory.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/logger/class_LoggerFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/logger/class_LoggerFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/login/class_LoginFactory.php b/framework/main/classes/factories/login/class_LoginFactory.php index fc3e1586..29ba36c7 100644 --- a/framework/main/classes/factories/login/class_LoginFactory.php +++ b/framework/main/classes/factories/login/class_LoginFactory.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/login/class_LoginFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/login/class_LoginFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php index f06a70a1..5467f403 100644 --- a/framework/main/classes/factories/objects/class_ObjectFactory.php +++ b/framework/main/classes/factories/objects/class_ObjectFactory.php @@ -14,7 +14,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/objects/class_ObjectFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/objects/class_ObjectFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php index 14c4eab2..ed1442f0 100644 --- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php +++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/registry/class_SocketRegistryFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/registry/class_SocketRegistryFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/stacks/class_FileStackFactory.php b/framework/main/classes/factories/stacks/class_FileStackFactory.php index 8b875c2a..8b30ffea 100644 --- a/framework/main/classes/factories/stacks/class_FileStackFactory.php +++ b/framework/main/classes/factories/stacks/class_FileStackFactory.php @@ -15,7 +15,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/stacks/class_FileStackFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/stacks/class_FileStackFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/factories/user/class_UserFactory.php b/framework/main/classes/factories/user/class_UserFactory.php index 19ef3d95..2a84ea28 100644 --- a/framework/main/classes/factories/user/class_UserFactory.php +++ b/framework/main/classes/factories/user/class_UserFactory.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/user/class_UserFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/user/class_UserFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php index 5995010a..7b92ab72 100644 --- a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php +++ b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/feature/class_ b/framework/main/classes/feature/class_ index f48cd3cf..e40f81e9 100644 --- a/framework/main/classes/feature/class_ +++ b/framework/main/classes/feature/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Feature\Feature; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/feature/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/feature/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/feature/class_BaseFeature.php b/framework/main/classes/feature/class_BaseFeature.php index 68a30fe9..e439104b 100644 --- a/framework/main/classes/feature/class_BaseFeature.php +++ b/framework/main/classes/feature/class_BaseFeature.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/feature/class_BaseFeature.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/feature/class_BaseFeature.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php index 84410bc3..371d2cda 100644 --- a/framework/main/classes/feature/class_FrameworkFeature.php +++ b/framework/main/classes/feature/class_FrameworkFeature.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/feature/class_FrameworkFeature.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/feature/class_FrameworkFeature.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/feature/fuse/class_FuseFeature.php b/framework/main/classes/feature/fuse/class_FuseFeature.php index cd70e38f..a42fda14 100644 --- a/framework/main/classes/feature/fuse/class_FuseFeature.php +++ b/framework/main/classes/feature/fuse/class_FuseFeature.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Feature\Feature; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/feature/fuse/class_FuseFeature.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/feature/fuse/class_FuseFeature.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php index 40a24c55..4c1f0e12 100644 --- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php +++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php @@ -16,7 +16,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/binary/class_BaseBinaryFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/binary/class_BaseBinaryFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/binary/index/class_IndexFile.php b/framework/main/classes/file_directories/binary/index/class_IndexFile.php index 958792df..133f346c 100644 --- a/framework/main/classes/file_directories/binary/index/class_IndexFile.php +++ b/framework/main/classes/file_directories/binary/index/class_IndexFile.php @@ -15,7 +15,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/binary/index/class_IndexFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/binary/index/class_IndexFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/binary/stack/class_StackFile.php b/framework/main/classes/file_directories/binary/stack/class_StackFile.php index 444302ba..3c980fc8 100644 --- a/framework/main/classes/file_directories/binary/stack/class_StackFile.php +++ b/framework/main/classes/file_directories/binary/stack/class_StackFile.php @@ -15,7 +15,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/binary/stack/class_StackFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/binary/stack/class_StackFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/class_BaseAbstractFile.php b/framework/main/classes/file_directories/class_BaseAbstractFile.php index 92b3f114..d9cb807a 100644 --- a/framework/main/classes/file_directories/class_BaseAbstractFile.php +++ b/framework/main/classes/file_directories/class_BaseAbstractFile.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseAbstractFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/class_BaseAbstractFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/class_BaseFileIo.php b/framework/main/classes/file_directories/class_BaseFileIo.php index ce65bd89..72a6a165 100644 --- a/framework/main/classes/file_directories/class_BaseFileIo.php +++ b/framework/main/classes/file_directories/class_BaseFileIo.php @@ -16,7 +16,11 @@ use \SplFileObject; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseFileIo.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/class_BaseFileIo.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php index 4c033024..9695a7ab 100644 --- a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php +++ b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php @@ -15,7 +15,11 @@ use \DirectoryIterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php index fc3ab6db..1481444f 100644 --- a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php +++ b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php @@ -20,7 +20,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php index 1b3c88ee..6694f003 100644 --- a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php +++ b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php b/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php index 971b3aca..b2a9ff8d 100644 --- a/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php +++ b/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php @@ -20,7 +20,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php index ae0f6352..dcd34e42 100644 --- a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php +++ b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php @@ -19,7 +19,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/io_stream/class_FileIoStream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/io_stream/class_FileIoStream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php index 81bd3433..7e596bd7 100644 --- a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php +++ b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php @@ -16,7 +16,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php index d94ec9ce..56c502f4 100644 --- a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php +++ b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php @@ -17,7 +17,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/file_directories/text/class_BaseTextFile.php b/framework/main/classes/file_directories/text/class_BaseTextFile.php index f56cc96e..f8dc38d5 100644 --- a/framework/main/classes/file_directories/text/class_BaseTextFile.php +++ b/framework/main/classes/file_directories/text/class_BaseTextFile.php @@ -14,7 +14,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/text/class_BaseTextFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/text/class_BaseTextFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php index 1767a55a..e4992bb0 100644 --- a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php +++ b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Filesystem\File\BaseTextFile; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php index 3343c6dd..a2e30e73 100644 --- a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php +++ b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stream\Filesystem\CsvInputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php index 30212999..00894d0a 100644 --- a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php +++ b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/filesystem/class_ b/framework/main/classes/filesystem/class_ index 2d5ea467..a1cc285c 100644 --- a/framework/main/classes/filesystem/class_ +++ b/framework/main/classes/filesystem/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filesystem/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filesystem/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/filesystem/class_BaseFilesystem.php b/framework/main/classes/filesystem/class_BaseFilesystem.php index 20c2fe10..64739adc 100644 --- a/framework/main/classes/filesystem/class_BaseFilesystem.php +++ b/framework/main/classes/filesystem/class_BaseFilesystem.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filesystem/class_BaseFilesystem.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filesystem/class_BaseFilesystem.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php index 8846379a..a6873b12 100644 --- a/framework/main/classes/filter/auth/class_UserAuthFilter.php +++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/auth/class_UserAuthFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/auth/class_UserAuthFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php index e4fcd519..e7c3be06 100644 --- a/framework/main/classes/filter/change/class_EmailChangeFilter.php +++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/change/class_EmailChangeFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/change/class_EmailChangeFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php index 331860fa..ce6a1c46 100644 --- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/change/class_PasswordChangeFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/change/class_PasswordChangeFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php index a5d88210..6fe6972d 100644 --- a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php +++ b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/class_ b/framework/main/classes/filter/class_ index 0bdc5e69..11f46c9a 100644 --- a/framework/main/classes/filter/class_ +++ b/framework/main/classes/filter/class_ @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/filter/class_BaseFilter.php b/framework/main/classes/filter/class_BaseFilter.php index 18c78800..7285f751 100644 --- a/framework/main/classes/filter/class_BaseFilter.php +++ b/framework/main/classes/filter/class_BaseFilter.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/class_BaseFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/class_BaseFilterDecorator.php b/framework/main/classes/filter/class_BaseFilterDecorator.php index d4e81e7c..60d743bd 100644 --- a/framework/main/classes/filter/class_BaseFilterDecorator.php +++ b/framework/main/classes/filter/class_BaseFilterDecorator.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilterDecorator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/class_BaseFilterDecorator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/class_FilterChain.php b/framework/main/classes/filter/class_FilterChain.php index ad376f9b..045deeee 100644 --- a/framework/main/classes/filter/class_FilterChain.php +++ b/framework/main/classes/filter/class_FilterChain.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/class_FilterChain.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/class_FilterChain.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php index 128e06fa..955af143 100644 --- a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php +++ b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php index 20683cb6..3a2c21cf 100644 --- a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php +++ b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/news/class_NewsDownloadFilter.php b/framework/main/classes/filter/news/class_NewsDownloadFilter.php index 3b68ea3c..205043cf 100644 --- a/framework/main/classes/filter/news/class_NewsDownloadFilter.php +++ b/framework/main/classes/filter/news/class_NewsDownloadFilter.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsDownloadFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/news/class_NewsDownloadFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/news/class_NewsProcessFilter.php b/framework/main/classes/filter/news/class_NewsProcessFilter.php index adf18ed2..3eae3714 100644 --- a/framework/main/classes/filter/news/class_NewsProcessFilter.php +++ b/framework/main/classes/filter/news/class_NewsProcessFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsProcessFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/news/class_NewsProcessFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/null/class_NullFilter.php b/framework/main/classes/filter/null/class_NullFilter.php index f8a92eab..781312f9 100644 --- a/framework/main/classes/filter/null/class_NullFilter.php +++ b/framework/main/classes/filter/null/class_NullFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/null/class_NullFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/null/class_NullFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php index 71bec6af..22b43174 100644 --- a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php +++ b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php @@ -20,7 +20,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php index dd5c4c79..13e82f16 100644 --- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php +++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/update/class_UserUpdateFilter.php b/framework/main/classes/filter/update/class_UserUpdateFilter.php index a6163692..c49bddfb 100644 --- a/framework/main/classes/filter/update/class_UserUpdateFilter.php +++ b/framework/main/classes/filter/update/class_UserUpdateFilter.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/update/class_UserUpdateFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/update/class_UserUpdateFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php index 15bde169..8e6fcf59 100644 --- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php +++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/validator/class_EmailValidatorFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/validator/class_EmailValidatorFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php index 80a02acc..3c0ad071 100644 --- a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php +++ b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/validator/class_PasswordValidatorFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/validator/class_PasswordValidatorFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php index 1b0aa6e2..dac5153b 100644 --- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php +++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/validator/class_UserNameValidatorFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/validator/class_UserNameValidatorFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php index 0c9fc307..a8c99970 100644 --- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php @@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php index cf608314..e824c3e8 100644 --- a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php index 53817198..474a81d3 100644 --- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php index 3a123427..db321359 100644 --- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php index faceca02..931f6a4c 100644 --- a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php index 1fff8de6..099fad3a 100644 --- a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php index 9e559c6e..c6ec0215 100644 --- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php index bc6613aa..c56c8c6f 100644 --- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php index 3d77ab6d..b9f060bf 100644 --- a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php index ddc4edd5..2a064ba5 100644 --- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued index 6f17387c..14a4c47a 100644 --- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued +++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued @@ -17,7 +17,11 @@ use \FuseWrapper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/fuse/class_FrameworkFuseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/handler/class_ b/framework/main/classes/handler/class_ index 0faf7277..4cb03987 100644 --- a/framework/main/classes/handler/class_ +++ b/framework/main/classes/handler/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Handler\BaseHandler; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/handler/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/handler/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php index c5dcd485..48a6b084 100644 --- a/framework/main/classes/handler/class_BaseHandler.php +++ b/framework/main/classes/handler/class_BaseHandler.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/handler/class_BaseHandler.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/handler/class_BaseHandler.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php index dfc01422..be1c8fde 100644 --- a/framework/main/classes/handler/tasks/class_TaskHandler.php +++ b/framework/main/classes/handler/tasks/class_TaskHandler.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/handler/tasks/class_TaskHandler.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/handler/tasks/class_TaskHandler.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/captcha/class_ b/framework/main/classes/helper/captcha/class_ index c2938918..5eefd012 100644 --- a/framework/main/classes/helper/captcha/class_ +++ b/framework/main/classes/helper/captcha/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/captcha/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/captcha/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php index f0bb7aeb..385460f9 100644 --- a/framework/main/classes/helper/captcha/class_BaseCaptcha.php +++ b/framework/main/classes/helper/captcha/class_BaseCaptcha.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/captcha/class_BaseCaptcha.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/captcha/class_BaseCaptcha.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/captcha/images/class_ImageHelper.php b/framework/main/classes/helper/captcha/images/class_ImageHelper.php index da87bb80..81f30c7e 100644 --- a/framework/main/classes/helper/captcha/images/class_ImageHelper.php +++ b/framework/main/classes/helper/captcha/images/class_ImageHelper.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/captcha/images/class_ImageHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/captcha/images/class_ImageHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php index 45eaf4a8..9ffe45aa 100644 --- a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php +++ b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/class_ b/framework/main/classes/helper/class_ index dd3b11b4..bbeaf312 100644 --- a/framework/main/classes/helper/class_ +++ b/framework/main/classes/helper/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/helper/class_BaseHelper.php b/framework/main/classes/helper/class_BaseHelper.php index 1ab249c5..3c40725f 100644 --- a/framework/main/classes/helper/class_BaseHelper.php +++ b/framework/main/classes/helper/class_BaseHelper.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/class_BaseHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/class_BaseHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php index ac4c008a..b81c8025 100644 --- a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php +++ b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/html/class_ b/framework/main/classes/helper/html/class_ index 7ddd9e5d..ea053068 100644 --- a/framework/main/classes/helper/html/class_ +++ b/framework/main/classes/helper/html/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/html/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/html/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/helper/html/class_BaseHtmlHelper.php b/framework/main/classes/helper/html/class_BaseHtmlHelper.php index 1f439d8e..5617d41e 100644 --- a/framework/main/classes/helper/html/class_BaseHtmlHelper.php +++ b/framework/main/classes/helper/html/class_BaseHtmlHelper.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/html/class_BaseHtmlHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/html/class_BaseHtmlHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php index b023b97a..acfb8d0d 100644 --- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php +++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php @@ -18,7 +18,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/html/forms/class_HtmlFormHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/html/forms/class_HtmlFormHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php index 7c02df3d..f02a8292 100644 --- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php +++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/html/links/class_HtmlLinkHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/html/links/class_HtmlLinkHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/helper/login/class_BaseLoginHelper.php b/framework/main/classes/helper/login/class_BaseLoginHelper.php index 2957c937..4d113043 100644 --- a/framework/main/classes/helper/login/class_BaseLoginHelper.php +++ b/framework/main/classes/helper/login/class_BaseLoginHelper.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/login/class_BaseLoginHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/helper/login/class_BaseLoginHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/images/class_ b/framework/main/classes/images/class_ index 2197725e..67f9fda2 100644 --- a/framework/main/classes/images/class_ +++ b/framework/main/classes/images/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/images/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/images/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php index e83375f9..d7cf32e3 100644 --- a/framework/main/classes/images/class_BaseImage.php +++ b/framework/main/classes/images/class_BaseImage.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/images/class_BaseImage.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/images/class_BaseImage.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/images/extended/class_PngImage.php b/framework/main/classes/images/extended/class_PngImage.php index 86f6124c..ae77b5cb 100644 --- a/framework/main/classes/images/extended/class_PngImage.php +++ b/framework/main/classes/images/extended/class_PngImage.php @@ -14,7 +14,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/images/extended/class_PngImage.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/images/extended/class_PngImage.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/index/class_ b/framework/main/classes/index/class_ index 4bda48c0..1e9ca164 100644 --- a/framework/main/classes/index/class_ +++ b/framework/main/classes/index/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/index/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/index/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/index/class_BaseIndex.php b/framework/main/classes/index/class_BaseIndex.php index dbc65fe8..24e9f79d 100644 --- a/framework/main/classes/index/class_BaseIndex.php +++ b/framework/main/classes/index/class_BaseIndex.php @@ -17,7 +17,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/index/class_BaseIndex.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/index/class_BaseIndex.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/index/file_stack/class_FileStackIndex.php b/framework/main/classes/index/file_stack/class_FileStackIndex.php index 7d330609..7e8bc50c 100644 --- a/framework/main/classes/index/file_stack/class_FileStackIndex.php +++ b/framework/main/classes/index/file_stack/class_FileStackIndex.php @@ -17,7 +17,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/index/file_stack/class_FileStackIndex.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/index/file_stack/class_FileStackIndex.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/iterator/class_ b/framework/main/classes/iterator/class_ index 37ff89a9..d04bc16b 100644 --- a/framework/main/classes/iterator/class_ +++ b/framework/main/classes/iterator/class_ @@ -13,7 +13,11 @@ use \Iterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/iterator/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/iterator/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/iterator/class_BaseIterator.php b/framework/main/classes/iterator/class_BaseIterator.php index 36f1bb0e..eb9ae21e 100644 --- a/framework/main/classes/iterator/class_BaseIterator.php +++ b/framework/main/classes/iterator/class_BaseIterator.php @@ -13,7 +13,11 @@ use \Iterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/iterator/class_BaseIterator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/iterator/class_BaseIterator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/iterator/default/class_DefaultIterator.php b/framework/main/classes/iterator/default/class_DefaultIterator.php index 5b482861..79e9f788 100644 --- a/framework/main/classes/iterator/default/class_DefaultIterator.php +++ b/framework/main/classes/iterator/default/class_DefaultIterator.php @@ -15,7 +15,11 @@ use \Iterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/iterator/default/class_DefaultIterator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/iterator/default/class_DefaultIterator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/iterator/file/class_FileIterator.php b/framework/main/classes/iterator/file/class_FileIterator.php index b4945aee..ba9fd2c8 100644 --- a/framework/main/classes/iterator/file/class_FileIterator.php +++ b/framework/main/classes/iterator/file/class_FileIterator.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Iterator\Filesystem\SeekableWritableFileIterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/iterator/file/class_FileIterator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/iterator/file/class_FileIterator.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/language/class_LanguageSystem.php b/framework/main/classes/language/class_LanguageSystem.php index a4d851e5..566302bd 100644 --- a/framework/main/classes/language/class_LanguageSystem.php +++ b/framework/main/classes/language/class_LanguageSystem.php @@ -17,7 +17,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/language/class_LanguageSystem.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/language/class_LanguageSystem.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/lists/class_ b/framework/main/classes/lists/class_ index a6dfa935..c7ea5936 100644 --- a/framework/main/classes/lists/class_ +++ b/framework/main/classes/lists/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/lists/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/lists/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/lists/class_BaseList.php b/framework/main/classes/lists/class_BaseList.php index bb583636..599b1bb4 100644 --- a/framework/main/classes/lists/class_BaseList.php +++ b/framework/main/classes/lists/class_BaseList.php @@ -17,7 +17,11 @@ use \Countable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/lists/class_BaseList.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/lists/class_BaseList.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/lists/groups/class_ListGroupList.php b/framework/main/classes/lists/groups/class_ListGroupList.php index 0c0557dc..25462f80 100644 --- a/framework/main/classes/lists/groups/class_ListGroupList.php +++ b/framework/main/classes/lists/groups/class_ListGroupList.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Lists\Listable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/lists/groups/class_ListGroupList.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/lists/groups/class_ListGroupList.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/lists/tasks/class_TaskList.php b/framework/main/classes/lists/tasks/class_TaskList.php index 722fa150..afe34e61 100644 --- a/framework/main/classes/lists/tasks/class_TaskList.php +++ b/framework/main/classes/lists/tasks/class_TaskList.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Lists\Listable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/lists/tasks/class_TaskList.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/lists/tasks/class_TaskList.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/mailer/class_ b/framework/main/classes/mailer/class_ index b25be3f6..344579bf 100644 --- a/framework/main/classes/mailer/class_ +++ b/framework/main/classes/mailer/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Mailer\DeliverableMail; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/mailer/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/mailer/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/mailer/class_BaseMailer.php b/framework/main/classes/mailer/class_BaseMailer.php index 6c0a52aa..fe82ab31 100644 --- a/framework/main/classes/mailer/class_BaseMailer.php +++ b/framework/main/classes/mailer/class_BaseMailer.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/mailer/class_BaseMailer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/mailer/class_BaseMailer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php index a0a18c42..200a0ece 100644 --- a/framework/main/classes/mailer/debug/class_DebugMailer.php +++ b/framework/main/classes/mailer/debug/class_DebugMailer.php @@ -18,7 +18,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/mailer/debug/class_DebugMailer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/mailer/debug/class_DebugMailer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_ index f2894d84..60b0b2fd 100644 --- a/framework/main/classes/output/class_ +++ b/framework/main/classes/output/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/class_BaseOutput.php b/framework/main/classes/output/class_BaseOutput.php index c4ba1305..2507207b 100644 --- a/framework/main/classes/output/class_BaseOutput.php +++ b/framework/main/classes/output/class_BaseOutput.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/class_BaseOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/class_BaseOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/console/class_ConsoleOutput.php b/framework/main/classes/output/console/class_ConsoleOutput.php index 3d75464a..d48acd30 100644 --- a/framework/main/classes/output/console/class_ConsoleOutput.php +++ b/framework/main/classes/output/console/class_ConsoleOutput.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/console/class_ConsoleOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/console/class_ConsoleOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/debug/class_BaseDebugOutput.php b/framework/main/classes/output/debug/class_BaseDebugOutput.php index f4c82617..dd640de4 100644 --- a/framework/main/classes/output/debug/class_BaseDebugOutput.php +++ b/framework/main/classes/output/debug/class_BaseDebugOutput.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/debug/class_BaseDebugOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/debug/class_BaseDebugOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php index 113428a4..22a146f2 100644 --- a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php +++ b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/debug/console/class_DebugConsoleOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/debug/console/class_DebugConsoleOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php index 2a797869..48911988 100644 --- a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php +++ b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/debug/error/class_DebugErrorLogOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/debug/web/class_DebugWebOutput.php b/framework/main/classes/output/debug/web/class_DebugWebOutput.php index 930ff9e6..8cae7db6 100644 --- a/framework/main/classes/output/debug/web/class_DebugWebOutput.php +++ b/framework/main/classes/output/debug/web/class_DebugWebOutput.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/debug/web/class_DebugWebOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/debug/web/class_DebugWebOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/output/web/class_WebOutput.php b/framework/main/classes/output/web/class_WebOutput.php index 48ef1106..267a4f60 100644 --- a/framework/main/classes/output/web/class_WebOutput.php +++ b/framework/main/classes/output/web/class_WebOutput.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/output/web/class_WebOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/output/web/class_WebOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/parser/class_ b/framework/main/classes/parser/class_ index d8721cb3..9271b7d9 100644 --- a/framework/main/classes/parser/class_ +++ b/framework/main/classes/parser/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/parser/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/parser/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/parser/class_BaseParser.php b/framework/main/classes/parser/class_BaseParser.php index 1020c0e9..dec3f0be 100644 --- a/framework/main/classes/parser/class_BaseParser.php +++ b/framework/main/classes/parser/class_BaseParser.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/parser/class_BaseParser.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/parser/class_BaseParser.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/parser/xml/class_XmlParser.php b/framework/main/classes/parser/xml/class_XmlParser.php index 9ebf852c..f232c289 100644 --- a/framework/main/classes/parser/xml/class_XmlParser.php +++ b/framework/main/classes/parser/xml/class_XmlParser.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/parser/xml/class_XmlParser.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/parser/xml/class_XmlParser.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php index 786446c6..5f655a53 100644 --- a/framework/main/classes/points/class_UserPoints.php +++ b/framework/main/classes/points/class_UserPoints.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/points/class_UserPoints.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/points/class_UserPoints.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/reader/class_ConsoleNewsReader.php b/framework/main/classes/reader/class_ConsoleNewsReader.php index dbbc8dec..31e47ef9 100644 --- a/framework/main/classes/reader/class_ConsoleNewsReader.php +++ b/framework/main/classes/reader/class_ConsoleNewsReader.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/reader/class_ConsoleNewsReader.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/reader/class_ConsoleNewsReader.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/reader/class_DefaultNewsReader.php b/framework/main/classes/reader/class_DefaultNewsReader.php index a79102bf..b988f43e 100644 --- a/framework/main/classes/reader/class_DefaultNewsReader.php +++ b/framework/main/classes/reader/class_DefaultNewsReader.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/reader/class_DefaultNewsReader.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/reader/class_DefaultNewsReader.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/registration/class_BaseRegistration.php b/framework/main/classes/registration/class_BaseRegistration.php index 6dad6fdf..9f6affe2 100644 --- a/framework/main/classes/registration/class_BaseRegistration.php +++ b/framework/main/classes/registration/class_BaseRegistration.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/registration/class_BaseRegistration.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/registration/class_BaseRegistration.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/registry/class_ b/framework/main/classes/registry/class_ index 7aa0e913..cd322446 100644 --- a/framework/main/classes/registry/class_ +++ b/framework/main/classes/registry/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Register; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/registry/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/registry/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/registry/class_BaseRegistry.php b/framework/main/classes/registry/class_BaseRegistry.php index 871975af..cf406493 100644 --- a/framework/main/classes/registry/class_BaseRegistry.php +++ b/framework/main/classes/registry/class_BaseRegistry.php @@ -15,7 +15,11 @@ use \IteratorAggregate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/registry/class_BaseRegistry.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/registry/class_BaseRegistry.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/registry/generic/class_Registry.php b/framework/main/classes/registry/generic/class_Registry.php index 476628e9..ca9ec099 100644 --- a/framework/main/classes/registry/generic/class_Registry.php +++ b/framework/main/classes/registry/generic/class_Registry.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Registry\Register; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/registry/generic/class_Registry.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/registry/generic/class_Registry.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/registry/sub/class_SubRegistry.php b/framework/main/classes/registry/sub/class_SubRegistry.php index 1df76b28..e7725baa 100644 --- a/framework/main/classes/registry/sub/class_SubRegistry.php +++ b/framework/main/classes/registry/sub/class_SubRegistry.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Register; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/registry/sub/class_SubRegistry.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/registry/sub/class_SubRegistry.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/request/class_ b/framework/main/classes/request/class_ index 48b31cea..f46f5000 100644 --- a/framework/main/classes/request/class_ +++ b/framework/main/classes/request/class_ @@ -7,7 +7,11 @@ namespace CoreFramework\Request; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/request/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/request/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/request/class_BaseRequest.php b/framework/main/classes/request/class_BaseRequest.php index 0fa759a1..56ff6b06 100644 --- a/framework/main/classes/request/class_BaseRequest.php +++ b/framework/main/classes/request/class_BaseRequest.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/request/class_BaseRequest.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/request/class_BaseRequest.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/request/console/class_ConsoleRequest.php b/framework/main/classes/request/console/class_ConsoleRequest.php index 6aa36c57..3a85f3e2 100644 --- a/framework/main/classes/request/console/class_ConsoleRequest.php +++ b/framework/main/classes/request/console/class_ConsoleRequest.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/request/console/class_ConsoleRequest.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/request/console/class_ConsoleRequest.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/request/html/class_HtmlRequest.php b/framework/main/classes/request/html/class_HtmlRequest.php index 13267002..714b4cc0 100644 --- a/framework/main/classes/request/html/class_HtmlRequest.php +++ b/framework/main/classes/request/html/class_HtmlRequest.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/request/html/class_HtmlRequest.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/request/html/class_HtmlRequest.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Move out the cookie part to a seperate class, e.g. Cookie diff --git a/framework/main/classes/resolver/action/class_BaseActionResolver.php b/framework/main/classes/resolver/action/class_BaseActionResolver.php index 58996de9..7136ba69 100644 --- a/framework/main/classes/resolver/action/class_BaseActionResolver.php +++ b/framework/main/classes/resolver/action/class_BaseActionResolver.php @@ -14,7 +14,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/action/class_BaseActionResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/action/class_BaseActionResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php index 38040fd4..eb7862b6 100644 --- a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php +++ b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php @@ -14,7 +14,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/action/html/class_HtmlActionResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/action/html/class_HtmlActionResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/class_BaseResolver.php b/framework/main/classes/resolver/class_BaseResolver.php index e93bcd81..177525e4 100644 --- a/framework/main/classes/resolver/class_BaseResolver.php +++ b/framework/main/classes/resolver/class_BaseResolver.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/class_BaseResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/class_BaseResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/command/class_BaseCommandResolver.php b/framework/main/classes/resolver/command/class_BaseCommandResolver.php index b0ddb5cc..6c463cd3 100644 --- a/framework/main/classes/resolver/command/class_BaseCommandResolver.php +++ b/framework/main/classes/resolver/command/class_BaseCommandResolver.php @@ -19,7 +19,11 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/command/class_BaseCommandResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/command/class_BaseCommandResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php index 2a12036e..1793bf2d 100644 --- a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php +++ b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php @@ -16,7 +16,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/command/html/class_Html b/framework/main/classes/resolver/command/html/class_Html index 06160b66..4f134737 100644 --- a/framework/main/classes/resolver/command/html/class_Html +++ b/framework/main/classes/resolver/command/html/class_Html @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/command/html/class_Html * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/command/html/class_Html * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php index df9262af..a164f720 100644 --- a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php +++ b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php @@ -15,7 +15,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/command/html/class_HtmlCommandResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php b/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php index 9e642c38..0c9ce924 100644 --- a/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php +++ b/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php @@ -14,7 +14,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/command/image/class_ImageCommandResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/command/image/class_ImageCommandResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php index 141fb9a8..a38b4ef3 100644 --- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php +++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php @@ -18,7 +18,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/controller/class_BaseControllerResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/controller/class_BaseControllerResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php b/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php index 72929591..d9b6b647 100644 --- a/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php +++ b/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php @@ -16,7 +16,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php index cbc46d0b..3a79138c 100644 --- a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php +++ b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php @@ -16,7 +16,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php index 02024241..e8c97015 100644 --- a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php +++ b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php @@ -16,7 +16,11 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php index fdce9724..4092a010 100644 --- a/framework/main/classes/response/class_BaseResponse.php +++ b/framework/main/classes/response/class_BaseResponse.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/response/class_BaseResponse.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/response/class_BaseResponse.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/response/console/class_ConsoleResponse.php b/framework/main/classes/response/console/class_ConsoleResponse.php index d98de4be..321c6ff6 100644 --- a/framework/main/classes/response/console/class_ConsoleResponse.php +++ b/framework/main/classes/response/console/class_ConsoleResponse.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/response/console/class_ConsoleResponse.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/response/console/class_ConsoleResponse.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php index 07036f71..ed050493 100644 --- a/framework/main/classes/response/html/class_HtmlResponse.php +++ b/framework/main/classes/response/html/class_HtmlResponse.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/response/html/class_HtmlResponse.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/response/html/class_HtmlResponse.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php index 3521252a..8594ca4f 100644 --- a/framework/main/classes/response/image/class_ImageResponse.php +++ b/framework/main/classes/response/image/class_ImageResponse.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/response/image/class_ImageResponse.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/response/image/class_ImageResponse.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/rng/class_RandomNumberGenerator.php b/framework/main/classes/rng/class_RandomNumberGenerator.php index e1a34ea8..c2e04ae2 100644 --- a/framework/main/classes/rng/class_RandomNumberGenerator.php +++ b/framework/main/classes/rng/class_RandomNumberGenerator.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/rng/class_RandomNumberGenerator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/rng/class_RandomNumberGenerator.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/stacker/class_ b/framework/main/classes/stacker/class_ index c3c188ed..629bcd41 100644 --- a/framework/main/classes/stacker/class_ +++ b/framework/main/classes/stacker/class_ @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/stacker/class_BaseStacker.php b/framework/main/classes/stacker/class_BaseStacker.php index d6d627ca..602de195 100644 --- a/framework/main/classes/stacker/class_BaseStacker.php +++ b/framework/main/classes/stacker/class_BaseStacker.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/class_BaseStacker.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/class_BaseStacker.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/stacker/fifo/class_FiFoStacker.php b/framework/main/classes/stacker/fifo/class_FiFoStacker.php index 6e73709e..689f2103 100644 --- a/framework/main/classes/stacker/fifo/class_FiFoStacker.php +++ b/framework/main/classes/stacker/fifo/class_FiFoStacker.php @@ -7,7 +7,11 @@ namespace Org\Mxchange\CoreFramework\Stacker; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/fifo/class_FiFoStacker.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/fifo/class_FiFoStacker.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/stacker/file/class_ b/framework/main/classes/stacker/file/class_ index 952279a2..b3a3934a 100644 --- a/framework/main/classes/stacker/file/class_ +++ b/framework/main/classes/stacker/file/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/file/class_ * @copyright Copyright (c) 2017 Core Developer Team +======= + * @copyright Copyright (c) 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/file/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php index fbad6cd4..8bf35ac9 100644 --- a/framework/main/classes/stacker/file/class_BaseFileStack.php +++ b/framework/main/classes/stacker/file/class_BaseFileStack.php @@ -18,7 +18,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/file/class_BaseFileStack.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/file/class_BaseFileStack.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php index 9994e38c..d44ba9f6 100644 --- a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php +++ b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php @@ -16,7 +16,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php * @copyright Copyright (c) 2017 Core Developer Team +======= + * @copyright Copyright (c) 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/stacker/filo/class_FiLoStacker.php b/framework/main/classes/stacker/filo/class_FiLoStacker.php index 61caf361..43e84b84 100644 --- a/framework/main/classes/stacker/filo/class_FiLoStacker.php +++ b/framework/main/classes/stacker/filo/class_FiLoStacker.php @@ -7,7 +7,11 @@ namespace Org\Mxchange\CoreFramework\Stacker; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/stacker/filo/class_FiLoStacker.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/stacker/filo/class_FiLoStacker.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/states/class_ b/framework/main/classes/states/class_ index f211a130..b81eaaf9 100644 --- a/framework/main/classes/states/class_ +++ b/framework/main/classes/states/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/states/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/states/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/states/class_BaseState.php b/framework/main/classes/states/class_BaseState.php index 820f31c3..5c7945db 100644 --- a/framework/main/classes/states/class_BaseState.php +++ b/framework/main/classes/states/class_BaseState.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\State\Stateable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/states/class_BaseState.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/states/class_BaseState.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/streams/class_BaseStream.php b/framework/main/classes/streams/class_BaseStream.php index 137016ae..7e21392d 100644 --- a/framework/main/classes/streams/class_BaseStream.php +++ b/framework/main/classes/streams/class_BaseStream.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/streams/class_BaseStream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/streams/class_BaseStream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/streams/crypto/class_McryptStream.php b/framework/main/classes/streams/crypto/class_McryptStream.php index 0c2fd314..f56018f4 100644 --- a/framework/main/classes/streams/crypto/class_McryptStream.php +++ b/framework/main/classes/streams/crypto/class_McryptStream.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Stream\BaseStream; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/streams/crypto/class_McryptStream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/streams/crypto/class_McryptStream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo mcrypt will become deprecated, rewrite to OpenSSL diff --git a/framework/main/classes/tasks/class_ b/framework/main/classes/tasks/class_ index 41a5bbcd..fe6ac768 100644 --- a/framework/main/classes/tasks/class_ +++ b/framework/main/classes/tasks/class_ @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/tasks/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/tasks/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/tasks/class_BaseTask.php b/framework/main/classes/tasks/class_BaseTask.php index 4f53883c..d948a4d5 100644 --- a/framework/main/classes/tasks/class_BaseTask.php +++ b/framework/main/classes/tasks/class_BaseTask.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/tasks/class_BaseTask.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/tasks/class_BaseTask.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php index 7652b588..4b149324 100644 --- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php +++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/tasks/idle/class_IdleLoopTask.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/tasks/idle/class_IdleLoopTask.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_ index fbea34b6..5e16c251 100644 --- a/framework/main/classes/template/class_ +++ b/framework/main/classes/template/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/template/class_BaseTemplateEngine.php b/framework/main/classes/template/class_BaseTemplateEngine.php index 01ff9a92..3bbeb010 100644 --- a/framework/main/classes/template/class_BaseTemplateEngine.php +++ b/framework/main/classes/template/class_BaseTemplateEngine.php @@ -20,7 +20,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/class_BaseTemplateEngine.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/class_BaseTemplateEngine.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php index f4f515e9..4367807f 100644 --- a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php +++ b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php @@ -16,7 +16,11 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/console/class_ConsoleTemplateEngine.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/console/class_ConsoleTemplateEngine.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This template engine does not make use of setTemplateType() diff --git a/framework/main/classes/template/html/class_HtmlTemplateEngine.php b/framework/main/classes/template/html/class_HtmlTemplateEngine.php index 2078434e..706b4a2f 100644 --- a/framework/main/classes/template/html/class_HtmlTemplateEngine.php +++ b/framework/main/classes/template/html/class_HtmlTemplateEngine.php @@ -17,7 +17,11 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/html/class_HtmlTemplateEngine.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/html/class_HtmlTemplateEngine.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/template/image/class_ImageTemplateEngine.php b/framework/main/classes/template/image/class_ImageTemplateEngine.php index 79fab8e5..5aa7e95d 100644 --- a/framework/main/classes/template/image/class_ImageTemplateEngine.php +++ b/framework/main/classes/template/image/class_ImageTemplateEngine.php @@ -20,7 +20,11 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/image/class_ImageTemplateEngine.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/image/class_ImageTemplateEngine.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/template/mail/class_MailTemplateEngine.php b/framework/main/classes/template/mail/class_MailTemplateEngine.php index b9758140..a1cef5cc 100644 --- a/framework/main/classes/template/mail/class_MailTemplateEngine.php +++ b/framework/main/classes/template/mail/class_MailTemplateEngine.php @@ -19,7 +19,11 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/mail/class_MailTemplateEngine.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/mail/class_MailTemplateEngine.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This template engine does not make use of setTemplateType() diff --git a/framework/main/classes/template/menu/class_MenuTemplateEngine.php b/framework/main/classes/template/menu/class_MenuTemplateEngine.php index 3521b8dd..a5baa283 100644 --- a/framework/main/classes/template/menu/class_MenuTemplateEngine.php +++ b/framework/main/classes/template/menu/class_MenuTemplateEngine.php @@ -19,7 +19,11 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/template/menu/class_MenuTemplateEngine.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/template/menu/class_MenuTemplateEngine.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/tools/console/class_ConsoleTools.php b/framework/main/classes/tools/console/class_ConsoleTools.php index feafde70..fbf17137 100644 --- a/framework/main/classes/tools/console/class_ConsoleTools.php +++ b/framework/main/classes/tools/console/class_ConsoleTools.php @@ -18,7 +18,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/tools/console/class_ConsoleTools.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Hub Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/console/class_ConsoleTools.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php index d4e1d511..393ebee0 100644 --- a/framework/main/classes/user/class_BaseUser.php +++ b/framework/main/classes/user/class_BaseUser.php @@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Result\Search\SearchableResult; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/user/class_BaseUser.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/user/class_BaseUser.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php index 60192e00..94e45ab2 100644 --- a/framework/main/classes/user/guest/class_Guest.php +++ b/framework/main/classes/user/guest/class_Guest.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/user/guest/class_Guest.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/user/guest/class_Guest.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php index f06d1c30..122448fc 100644 --- a/framework/main/classes/user/member/class_Member.php +++ b/framework/main/classes/user/member/class_Member.php @@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/user/member/class_Member.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/user/member/class_Member.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/classes/visitor/class_ b/framework/main/classes/visitor/class_ index 17f2a5f3..11ff3fd8 100644 --- a/framework/main/classes/visitor/class_ +++ b/framework/main/classes/visitor/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Visitor\BaseVisitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/visitor/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/visitor/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/classes/visitor/class_BaseVisitor.php b/framework/main/classes/visitor/class_BaseVisitor.php index 19ab9221..51af653e 100644 --- a/framework/main/classes/visitor/class_BaseVisitor.php +++ b/framework/main/classes/visitor/class_BaseVisitor.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/visitor/class_BaseVisitor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/classes/visitor/class_BaseVisitor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/actions/class_InvalidActionException.php b/framework/main/exceptions/actions/class_InvalidActionException.php index 8b709c6f..013794ab 100644 --- a/framework/main/exceptions/actions/class_InvalidActionException.php +++ b/framework/main/exceptions/actions/class_InvalidActionException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/actions/class_InvalidActionException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/actions/class_InvalidActionException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/auth/class_UserAuthorizationException.php b/framework/main/exceptions/auth/class_UserAuthorizationException.php index 0d4495b1..d707ca12 100644 --- a/framework/main/exceptions/auth/class_UserAuthorizationException.php +++ b/framework/main/exceptions/auth/class_UserAuthorizationException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/auth/class_UserAuthorizationException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/auth/class_UserAuthorizationException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/base64/class_Base64EncodingBadException.php b/framework/main/exceptions/base64/class_Base64EncodingBadException.php index 2fa669ae..77fe03be 100644 --- a/framework/main/exceptions/base64/class_Base64EncodingBadException.php +++ b/framework/main/exceptions/base64/class_Base64EncodingBadException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingBadException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/base64/class_Base64EncodingBadException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php index 433d9272..ea6b8161 100644 --- a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php +++ b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingModuloException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/base64/class_Base64EncodingModuloException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/class_ b/framework/main/exceptions/class_ index 2af02c8d..a6a81f4f 100644 --- a/framework/main/exceptions/class_ +++ b/framework/main/exceptions/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/exceptions/class_FrameworkException.php b/framework/main/exceptions/class_FrameworkException.php index e1dedd97..c75ed900 100644 --- a/framework/main/exceptions/class_FrameworkException.php +++ b/framework/main/exceptions/class_FrameworkException.php @@ -12,7 +12,11 @@ use \ReflectionException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/class_FrameworkException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/class_FrameworkException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php index 6a66dbe5..bca572be 100644 --- a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php +++ b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/compressor/class_MismatchingCompressorsException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/compressor/class_MismatchingCompressorsException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Rename to CompressorMismatchException diff --git a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php index d4b5002a..6ac3ecc7 100644 --- a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php +++ b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @todo These are invalid argument exceptions diff --git a/framework/main/exceptions/config/class_NoConfigEntryException.php b/framework/main/exceptions/config/class_NoConfigEntryException.php index 5c24a5b8..a662fc5d 100644 --- a/framework/main/exceptions/config/class_NoConfigEntryException.php +++ b/framework/main/exceptions/config/class_NoConfigEntryException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/config/class_NoConfigEntryException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/config/class_NoConfigEntryException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Rename this class to NoFoundEntryException diff --git a/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php b/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php index 9a9185a1..30a05733 100644 --- a/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php +++ b/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/controller/class_DefaultControllerException.php b/framework/main/exceptions/controller/class_DefaultControllerException.php index 7a247d30..3163c0b8 100644 --- a/framework/main/exceptions/controller/class_DefaultControllerException.php +++ b/framework/main/exceptions/controller/class_DefaultControllerException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/controller/class_DefaultControllerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/controller/class_DefaultControllerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/controller/class_InvalidControllerException.php b/framework/main/exceptions/controller/class_InvalidControllerException.php index aacc2e24..b9d7f5ea 100644 --- a/framework/main/exceptions/controller/class_InvalidControllerException.php +++ b/framework/main/exceptions/controller/class_InvalidControllerException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/controller/class_InvalidControllerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/controller/class_InvalidControllerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php b/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php index b1d470a1..afda6d5e 100644 --- a/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php +++ b/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/crypto/class_EncryptInvalidLengthException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/crypto/class_EncryptMissingException.php b/framework/main/exceptions/crypto/class_EncryptMissingException.php index a6633ed2..dc7685ec 100644 --- a/framework/main/exceptions/crypto/class_EncryptMissingException.php +++ b/framework/main/exceptions/crypto/class_EncryptMissingException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/crypto/class_EncryptMissingException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/crypto/class_EncryptMissingException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/database/class_ b/framework/main/exceptions/database/class_ index 5098f7ba..fc36e2a1 100644 --- a/framework/main/exceptions/database/class_ +++ b/framework/main/exceptions/database/class_ @@ -4,7 +4,11 @@ * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/database/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/database/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/exceptions/database/class_DatabaseException.php b/framework/main/exceptions/database/class_DatabaseException.php index ba71bd17..3a493b03 100644 --- a/framework/main/exceptions/database/class_DatabaseException.php +++ b/framework/main/exceptions/database/class_DatabaseException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/database/class_DatabaseException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/database/class_DatabaseException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/database/general/class_SqlException.php b/framework/main/exceptions/database/general/class_SqlException.php index cf385f22..e43f6deb 100644 --- a/framework/main/exceptions/database/general/class_SqlException.php +++ b/framework/main/exceptions/database/general/class_SqlException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/database/general/class_SqlException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/database/general/class_SqlException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php b/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php index 290f83a8..f55a9604 100644 --- a/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php +++ b/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this diff --git a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php index 9bb34605..2509edba 100644 --- a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php +++ b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/database/local_file/class_SavePathReadProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Please don't use this diff --git a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php index 439b3352..ad5e55f5 100644 --- a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php +++ b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Please don't use this diff --git a/framework/main/exceptions/dns/class_UnknownHostnameException.php b/framework/main/exceptions/dns/class_UnknownHostnameException.php index c96712e1..e999d30e 100644 --- a/framework/main/exceptions/dns/class_UnknownHostnameException.php +++ b/framework/main/exceptions/dns/class_UnknownHostnameException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/dns/class_UnknownHostnameException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_EmptyVariableException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php b/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php index c686e8b0..389579c5 100644 --- a/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php +++ b/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/feature/class_FeatureMethodNotCallableException.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php b/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php index 3a6339d5..afba88f3 100644 --- a/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php +++ b/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_DirPointerNotOpenedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/file_directory/class_FileIoException.php b/framework/main/exceptions/file_directory/class_FileIoException.php index e1649d03..535e5230 100644 --- a/framework/main/exceptions/file_directory/class_FileIoException.php +++ b/framework/main/exceptions/file_directory/class_FileIoException.php @@ -14,7 +14,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileIoException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_FileIoException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/file_directory/class_FileNotFoundException.php b/framework/main/exceptions/file_directory/class_FileNotFoundException.php index 5285157d..b05965c6 100644 --- a/framework/main/exceptions/file_directory/class_FileNotFoundException.php +++ b/framework/main/exceptions/file_directory/class_FileNotFoundException.php @@ -13,7 +13,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileNotFoundException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_FileNotFoundException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/file_directory/class_FileReadProtectedException.php b/framework/main/exceptions/file_directory/class_FileReadProtectedException.php index d791c3ed..b1634fb8 100644 --- a/framework/main/exceptions/file_directory/class_FileReadProtectedException.php +++ b/framework/main/exceptions/file_directory/class_FileReadProtectedException.php @@ -13,7 +13,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileReadProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_FileReadProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php b/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php index 3961d559..ad799053 100644 --- a/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php +++ b/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php @@ -13,7 +13,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileWriteProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_FileWriteProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php b/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php index 826f1ea2..a3058c35 100644 --- a/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php +++ b/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidDataLengthException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_InvalidDataLengthException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php b/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php index cb72311b..42143609 100644 --- a/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php +++ b/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/file_directory/class_InvalidResourceException.php b/framework/main/exceptions/file_directory/class_InvalidResourceException.php index 0e50681d..ea616c11 100644 --- a/framework/main/exceptions/file_directory/class_InvalidResourceException.php +++ b/framework/main/exceptions/file_directory/class_InvalidResourceException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidResourceException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_InvalidResourceException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php b/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php index b26387e4..a969b3e3 100644 --- a/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php +++ b/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_PathIsNoDirectoryException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/file_directory/class_PathReadProtectedException.php b/framework/main/exceptions/file_directory/class_PathReadProtectedException.php index b15a5fc3..0a50d077 100644 --- a/framework/main/exceptions/file_directory/class_PathReadProtectedException.php +++ b/framework/main/exceptions/file_directory/class_PathReadProtectedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathReadProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_PathReadProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php b/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php index 4e04017f..8366a53a 100644 --- a/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php +++ b/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php @@ -14,7 +14,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathWriteProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/file_directory/class_PathWriteProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/filter/class_FilterChainException.php b/framework/main/exceptions/filter/class_FilterChainException.php index f36495d3..bd335527 100644 --- a/framework/main/exceptions/filter/class_FilterChainException.php +++ b/framework/main/exceptions/filter/class_FilterChainException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/filter/class_FilterChainException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/filter/class_FilterChainException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/filter/class_InvalidFilterChainException.php b/framework/main/exceptions/filter/class_InvalidFilterChainException.php index b117c960..87d7dcfe 100644 --- a/framework/main/exceptions/filter/class_InvalidFilterChainException.php +++ b/framework/main/exceptions/filter/class_InvalidFilterChainException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/filter/class_InvalidFilterChainException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/filter/class_InvalidFilterChainException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_FormClosedException.php b/framework/main/exceptions/helper/class_FormClosedException.php index be2d4b8d..396ee34d 100644 --- a/framework/main/exceptions/helper/class_FormClosedException.php +++ b/framework/main/exceptions/helper/class_FormClosedException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_FormClosedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_FormClosedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_FormGroupClosedException.php b/framework/main/exceptions/helper/class_FormGroupClosedException.php index f45c8f1e..3c3dc740 100644 --- a/framework/main/exceptions/helper/class_FormGroupClosedException.php +++ b/framework/main/exceptions/helper/class_FormGroupClosedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_FormGroupClosedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_FormGroupClosedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_FormOpenedException.php b/framework/main/exceptions/helper/class_FormOpenedException.php index 7e172479..6401ec2c 100644 --- a/framework/main/exceptions/helper/class_FormOpenedException.php +++ b/framework/main/exceptions/helper/class_FormOpenedException.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_FormOpenedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_FormOpenedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php b/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php index 2c35f5e0..6e5a1c69 100644 --- a/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php +++ b/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php b/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php index 6da141e5..d401eb4c 100644 --- a/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php +++ b/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php b/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php index c00875c9..d44f3602 100644 --- a/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php +++ b/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_InvalidFormNameException.php b/framework/main/exceptions/helper/class_InvalidFormNameException.php index 59663373..c58711d3 100644 --- a/framework/main/exceptions/helper/class_InvalidFormNameException.php +++ b/framework/main/exceptions/helper/class_InvalidFormNameException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_InvalidFormNameException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_InvalidFormNameException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_NoGroupOpenedException.php b/framework/main/exceptions/helper/class_NoGroupOpenedException.php index fd28e2ac..9aa5b8b0 100644 --- a/framework/main/exceptions/helper/class_NoGroupOpenedException.php +++ b/framework/main/exceptions/helper/class_NoGroupOpenedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_NoGroupOpenedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_NoGroupOpenedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/helper/class_UserInstanceMissingException.php b/framework/main/exceptions/helper/class_UserInstanceMissingException.php index d6e34290..aa046bef 100644 --- a/framework/main/exceptions/helper/class_UserInstanceMissingException.php +++ b/framework/main/exceptions/helper/class_UserInstanceMissingException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/helper/class_UserInstanceMissingException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/helper/class_UserInstanceMissingException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php b/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php index edaef0d9..69e17809 100644 --- a/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php +++ b/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/language/class_InvalidLanguagePathStringException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/language/class_InvalidLanguagePathStringException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php b/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php index 59aefe4b..19213d73 100644 --- a/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php +++ b/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Don't use this anymore diff --git a/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php b/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php index cfaaa946..39759a00 100644 --- a/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php +++ b/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/language/class_LanguagePathReadProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/language/class_LanguagePathReadProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/main/class_AssertionException.php b/framework/main/exceptions/main/class_AssertionException.php index 933c52ab..dc337c4f 100644 --- a/framework/main/exceptions/main/class_AssertionException.php +++ b/framework/main/exceptions/main/class_AssertionException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_AssertionException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_AssertionException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_ClassMismatchException.php b/framework/main/exceptions/main/class_ClassMismatchException.php index e69f4621..e24f0f2c 100644 --- a/framework/main/exceptions/main/class_ClassMismatchException.php +++ b/framework/main/exceptions/main/class_ClassMismatchException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_ClassMismatchException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_ClassMismatchException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_DimNotFoundInArrayException.php b/framework/main/exceptions/main/class_DimNotFoundInArrayException.php index 2be4f6f3..2d172421 100644 --- a/framework/main/exceptions/main/class_DimNotFoundInArrayException.php +++ b/framework/main/exceptions/main/class_DimNotFoundInArrayException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_DimNotFoundInArrayException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_DimNotFoundInArrayException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Please don't use this anymore diff --git a/framework/main/exceptions/main/class_FatalErrorException.php b/framework/main/exceptions/main/class_FatalErrorException.php index 7b139844..b2ae4873 100644 --- a/framework/main/exceptions/main/class_FatalErrorException.php +++ b/framework/main/exceptions/main/class_FatalErrorException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_FatalErrorException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_FatalErrorException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php index 37475283..a72ae893 100644 --- a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php +++ b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_IndexOutOfBoundsException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_IndexOutOfBoundsException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_InvalidArrayCountException.php b/framework/main/exceptions/main/class_InvalidArrayCountException.php index 1ec609cf..8d630f0f 100644 --- a/framework/main/exceptions/main/class_InvalidArrayCountException.php +++ b/framework/main/exceptions/main/class_InvalidArrayCountException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidArrayCountException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidArrayCountException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/main/class_InvalidCommandException.php b/framework/main/exceptions/main/class_InvalidCommandException.php index ca84cd07..965e3609 100644 --- a/framework/main/exceptions/main/class_InvalidCommandException.php +++ b/framework/main/exceptions/main/class_InvalidCommandException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidCommandException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidCommandException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_InvalidInterfaceException.php b/framework/main/exceptions/main/class_InvalidInterfaceException.php index dc38900e..34c73996 100644 --- a/framework/main/exceptions/main/class_InvalidInterfaceException.php +++ b/framework/main/exceptions/main/class_InvalidInterfaceException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidInterfaceException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidInterfaceException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_InvalidObjectException.php b/framework/main/exceptions/main/class_InvalidObjectException.php index 0f28af78..cec325b1 100644 --- a/framework/main/exceptions/main/class_InvalidObjectException.php +++ b/framework/main/exceptions/main/class_InvalidObjectException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidObjectException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidObjectException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/main/class_MissingArrayElementsException.php b/framework/main/exceptions/main/class_MissingArrayElementsException.php index a7b250fd..93af76c2 100644 --- a/framework/main/exceptions/main/class_MissingArrayElementsException.php +++ b/framework/main/exceptions/main/class_MissingArrayElementsException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_MissingArrayElementsException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_MissingArrayElementsException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php index 74344cb4..91504045 100644 --- a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php +++ b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/main/class_NoClassException.php b/framework/main/exceptions/main/class_NoClassException.php index 61f275dc..c47806e1 100644 --- a/framework/main/exceptions/main/class_NoClassException.php +++ b/framework/main/exceptions/main/class_NoClassException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_NoClassException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_NoClassException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_NullPointerException.php b/framework/main/exceptions/main/class_NullPointerException.php index 62b1e341..9f4b0fc5 100644 --- a/framework/main/exceptions/main/class_NullPointerException.php +++ b/framework/main/exceptions/main/class_NullPointerException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_NullPointerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_NullPointerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php b/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php index b0dfeb53..54e80d92 100644 --- a/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php +++ b/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_ResponseHeadersAlreadySentException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_UnsupportedOperationException.php b/framework/main/exceptions/main/class_UnsupportedOperationException.php index a27c076e..02490bdc 100644 --- a/framework/main/exceptions/main/class_UnsupportedOperationException.php +++ b/framework/main/exceptions/main/class_UnsupportedOperationException.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_UnsupportedOperationException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_UnsupportedOperationException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/main/class_VariableIsNotSetException.php b/framework/main/exceptions/main/class_VariableIsNotSetException.php index 9573a843..f0ad6db1 100644 --- a/framework/main/exceptions/main/class_VariableIsNotSetException.php +++ b/framework/main/exceptions/main/class_VariableIsNotSetException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/main/class_VariableIsNotSetException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/main/class_VariableIsNotSetException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php index 3901ef8f..fccf8199 100644 --- a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php +++ b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/result/class_InvalidDatabaseResultException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/result/class_InvalidDatabaseResultException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/result/class_ResultUpdateException.php b/framework/main/exceptions/result/class_ResultUpdateException.php index d0e492f1..b46b2887 100644 --- a/framework/main/exceptions/result/class_ResultUpdateException.php +++ b/framework/main/exceptions/result/class_ResultUpdateException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/result/class_ResultUpdateException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/result/class_ResultUpdateException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_AbstractSocketException.php b/framework/main/exceptions/socket/class_AbstractSocketException.php index ff3d610c..da3b1117 100644 --- a/framework/main/exceptions/socket/class_AbstractSocketException.php +++ b/framework/main/exceptions/socket/class_AbstractSocketException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_AbstractSocketException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_AbstractSocketException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_InvalidServerSocketException.php b/framework/main/exceptions/socket/class_InvalidServerSocketException.php index d28e5d10..286e89c7 100644 --- a/framework/main/exceptions/socket/class_InvalidServerSocketException.php +++ b/framework/main/exceptions/socket/class_InvalidServerSocketException.php @@ -7,7 +7,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidServerSocketException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_InvalidServerSocketException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_InvalidSocketException.php b/framework/main/exceptions/socket/class_InvalidSocketException.php index c663ea3a..65212e0d 100644 --- a/framework/main/exceptions/socket/class_InvalidSocketException.php +++ b/framework/main/exceptions/socket/class_InvalidSocketException.php @@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidSocketException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_InvalidSocketException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php index b086bcf4..ae9fab95 100644 --- a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php +++ b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php @@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_NoSocketErrorDetectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Those are logic exceptions and should be rewritten diff --git a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php index 0612f581..d6308eb8 100644 --- a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php +++ b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php @@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketAlreadyRegisteredException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_SocketBindingException.php b/framework/main/exceptions/socket/class_SocketBindingException.php index d1cd271d..6383dfa5 100644 --- a/framework/main/exceptions/socket/class_SocketBindingException.php +++ b/framework/main/exceptions/socket/class_SocketBindingException.php @@ -6,7 +6,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketBindingException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketBindingException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_SocketConnectionException.php b/framework/main/exceptions/socket/class_SocketConnectionException.php index 96ead0cb..9b10453d 100644 --- a/framework/main/exceptions/socket/class_SocketConnectionException.php +++ b/framework/main/exceptions/socket/class_SocketConnectionException.php @@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketConnectionException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketConnectionException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_SocketCreationException.php b/framework/main/exceptions/socket/class_SocketCreationException.php index 5735bf2f..af37c613 100644 --- a/framework/main/exceptions/socket/class_SocketCreationException.php +++ b/framework/main/exceptions/socket/class_SocketCreationException.php @@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketCreationException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketCreationException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_SocketOptionException.php b/framework/main/exceptions/socket/class_SocketOptionException.php index 54cd20df..b701c4e9 100644 --- a/framework/main/exceptions/socket/class_SocketOptionException.php +++ b/framework/main/exceptions/socket/class_SocketOptionException.php @@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketOptionException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketOptionException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php index 0c9e7948..64d60363 100644 --- a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php +++ b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php @@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php index d98ddbe2..1edb630c 100644 --- a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php +++ b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/stacker/class_AlreadyInitializedStackerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/stacker/class_EmptyStackerException.php b/framework/main/exceptions/stacker/class_EmptyStackerException.php index 91b53f47..b1b6e952 100644 --- a/framework/main/exceptions/stacker/class_EmptyStackerException.php +++ b/framework/main/exceptions/stacker/class_EmptyStackerException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/stacker/class_EmptyStackerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/stacker/class_EmptyStackerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/stacker/class_FullStackerException.php b/framework/main/exceptions/stacker/class_FullStackerException.php index 1388995b..00447302 100644 --- a/framework/main/exceptions/stacker/class_FullStackerException.php +++ b/framework/main/exceptions/stacker/class_FullStackerException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/stacker/class_FullStackerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/stacker/class_FullStackerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/stacker/class_NoStackerException.php b/framework/main/exceptions/stacker/class_NoStackerException.php index 166edaed..38633313 100644 --- a/framework/main/exceptions/stacker/class_NoStackerException.php +++ b/framework/main/exceptions/stacker/class_NoStackerException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/stacker/class_NoStackerException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/stacker/class_NoStackerException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/state/class_InvalidStateInstanceException.php b/framework/main/exceptions/state/class_InvalidStateInstanceException.php index f529843b..69b701ff 100644 --- a/framework/main/exceptions/state/class_InvalidStateInstanceException.php +++ b/framework/main/exceptions/state/class_InvalidStateInstanceException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/state/class_InvalidStateInstanceException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/state/class_InvalidStateInstanceException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/state/class_UnexpectedStateException.php b/framework/main/exceptions/state/class_UnexpectedStateException.php index b2af8ba9..d64b5bda 100644 --- a/framework/main/exceptions/state/class_UnexpectedStateException.php +++ b/framework/main/exceptions/state/class_UnexpectedStateException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\State\Stateable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/state/class_UnexpectedStateException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/state/class_UnexpectedStateException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/state/class_UnresolveableStateException.php b/framework/main/exceptions/state/class_UnresolveableStateException.php index 36b3c0a3..62fa1374 100644 --- a/framework/main/exceptions/state/class_UnresolveableStateException.php +++ b/framework/main/exceptions/state/class_UnresolveableStateException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/state/class_UnresolveableStateException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/state/class_UnresolveableStateException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/template/class_BasePathReadProtectedException.php b/framework/main/exceptions/template/class_BasePathReadProtectedException.php index 3fb79123..bce750ff 100644 --- a/framework/main/exceptions/template/class_BasePathReadProtectedException.php +++ b/framework/main/exceptions/template/class_BasePathReadProtectedException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/template/class_BasePathReadProtectedException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/template/class_BasePathReadProtectedException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/template/class_InvalidDirectoryException.php b/framework/main/exceptions/template/class_InvalidDirectoryException.php index a8931b4e..515d64f6 100644 --- a/framework/main/exceptions/template/class_InvalidDirectoryException.php +++ b/framework/main/exceptions/template/class_InvalidDirectoryException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/template/class_InvalidDirectoryException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/template/class_BasePathIsNoDirectoryException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/template/class_NoVariableException.php b/framework/main/exceptions/template/class_NoVariableException.php index 671ee88a..2d3bdb3b 100644 --- a/framework/main/exceptions/template/class_NoVariableException.php +++ b/framework/main/exceptions/template/class_NoVariableException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/template/class_NoVariableException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/template/class_NoVariableException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php b/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php index c0c558cb..2572bea8 100644 --- a/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php +++ b/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/template/class_UnexpectedTemplateTypeException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated Don't use this anymore diff --git a/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php b/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php index cfc40553..b1fbe423 100644 --- a/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php +++ b/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/template/class_UnsupportedTemplateEngineException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php index 73ac7bd9..65b3a9e8 100644 --- a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php +++ b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/user/class_AccountPasswordMismatchException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/user/class_AccountPasswordMismatchException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php b/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php index 2525610a..bd6f3c28 100644 --- a/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php +++ b/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/user/class_UnexpectedGuestAccountException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/user/class_UnexpectedGuestAccountException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/user/class_UserEmailMissingException.php b/framework/main/exceptions/user/class_UserEmailMissingException.php index 38c4cfae..80309188 100644 --- a/framework/main/exceptions/user/class_UserEmailMissingException.php +++ b/framework/main/exceptions/user/class_UserEmailMissingException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/user/class_UserEmailMissingException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/user/class_UserEmailMissingException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/user/class_UserNoGuestException.php b/framework/main/exceptions/user/class_UserNoGuestException.php index aa719890..51e2ec01 100644 --- a/framework/main/exceptions/user/class_UserNoGuestException.php +++ b/framework/main/exceptions/user/class_UserNoGuestException.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/user/class_UserNoGuestException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/user/class_UserNoGuestException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Better rename this diff --git a/framework/main/exceptions/user/class_UserPasswordMismatchException.php b/framework/main/exceptions/user/class_UserPasswordMismatchException.php index c039a3b4..bfb6934a 100644 --- a/framework/main/exceptions/user/class_UserPasswordMismatchException.php +++ b/framework/main/exceptions/user/class_UserPasswordMismatchException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/user/class_UserPasswordMismatchException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/user/class_UserPasswordMismatchException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/user/class_UsernameMissingException.php b/framework/main/exceptions/user/class_UsernameMissingException.php index ff0725a9..f557c71f 100644 --- a/framework/main/exceptions/user/class_UsernameMissingException.php +++ b/framework/main/exceptions/user/class_UsernameMissingException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/user/class_UsernameMissingException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/user/class_UsernameMissingException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/xml/class_InvalidXmlNodeException.php b/framework/main/exceptions/xml/class_InvalidXmlNodeException.php index fc658552..e1c11aa5 100644 --- a/framework/main/exceptions/xml/class_InvalidXmlNodeException.php +++ b/framework/main/exceptions/xml/class_InvalidXmlNodeException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/xml/class_InvalidXmlNodeException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/xml/class_InvalidXmlNodeException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/xml/class_XmlNodeMismatchException.php b/framework/main/exceptions/xml/class_XmlNodeMismatchException.php index 00667c11..db2e749b 100644 --- a/framework/main/exceptions/xml/class_XmlNodeMismatchException.php +++ b/framework/main/exceptions/xml/class_XmlNodeMismatchException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/xml/class_XmlNodeMismatchException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/xml/class_XmlNodeMismatchException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/exceptions/xml/class_XmlParserException.php b/framework/main/exceptions/xml/class_XmlParserException.php index fb5cf584..a6d86852 100644 --- a/framework/main/exceptions/xml/class_XmlParserException.php +++ b/framework/main/exceptions/xml/class_XmlParserException.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/exceptions/xml/class_XmlParserException.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/exceptions/xml/class_XmlParserException.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/actions/class_PerformableAction.php b/framework/main/interfaces/actions/class_PerformableAction.php index d60b094b..9a99d9e0 100644 --- a/framework/main/interfaces/actions/class_PerformableAction.php +++ b/framework/main/interfaces/actions/class_PerformableAction.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/actions/class_PerformableAction.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/actions/class_PerformableAction.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/actions/commands/class_Commandable.php b/framework/main/interfaces/actions/commands/class_Commandable.php index d4c60e2d..b1b099e0 100644 --- a/framework/main/interfaces/actions/commands/class_Commandable.php +++ b/framework/main/interfaces/actions/commands/class_Commandable.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/actions/commands/class_Commandable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/actions/commands/class_Commandable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/application/class_ManageableApplication.php b/framework/main/interfaces/application/class_ManageableApplication.php index bf409cba..1f6dcb56 100644 --- a/framework/main/interfaces/application/class_ManageableApplication.php +++ b/framework/main/interfaces/application/class_ManageableApplication.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/application/class_ManageableApplication.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/application/class_ManageableApplication.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/auth/class_Authorizeable.php b/framework/main/interfaces/auth/class_Authorizeable.php index 22a777e1..8e192acd 100644 --- a/framework/main/interfaces/auth/class_Authorizeable.php +++ b/framework/main/interfaces/auth/class_Authorizeable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/auth/class_Authorizeable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/auth/class_Authorizeable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php index b6f076ae..5820c38d 100644 --- a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php +++ b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Filesystem\Block; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/block/calculatable/class_CalculatableBlock.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/block/calculatable/class_CalculatableBlock.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/block/class_Block.php b/framework/main/interfaces/block/class_Block.php index 5815f2de..b7f88f84 100644 --- a/framework/main/interfaces/block/class_Block.php +++ b/framework/main/interfaces/block/class_Block.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/block/class_Block.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/block/class_Block.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/cache/class_Cacheable.php b/framework/main/interfaces/cache/class_Cacheable.php index 2ea48a47..d3cc0623 100644 --- a/framework/main/interfaces/cache/class_Cacheable.php +++ b/framework/main/interfaces/cache/class_Cacheable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/cache/class_Cacheable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/cache/class_Cacheable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/captcha/class_SolveableCaptcha.php b/framework/main/interfaces/captcha/class_SolveableCaptcha.php index 5545289c..bb087f12 100644 --- a/framework/main/interfaces/captcha/class_SolveableCaptcha.php +++ b/framework/main/interfaces/captcha/class_SolveableCaptcha.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\Helper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/captcha/class_SolveableCaptcha.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/captcha/class_SolveableCaptcha.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/class_ b/framework/main/interfaces/class_ index b7c59130..725dee1c 100644 --- a/framework/main/interfaces/class_ +++ b/framework/main/interfaces/class_ @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/class_ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/class_ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/class_FrameworkInterface.php b/framework/main/interfaces/class_FrameworkInterface.php index d40ffb35..f1d3725f 100644 --- a/framework/main/interfaces/class_FrameworkInterface.php +++ b/framework/main/interfaces/class_FrameworkInterface.php @@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Generic; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/class_FrameworkInterface.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/class_FrameworkInterface.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Find a better name for this interface diff --git a/framework/main/interfaces/client/class_Client.php b/framework/main/interfaces/client/class_Client.php index 56626d6f..697aa0bd 100644 --- a/framework/main/interfaces/client/class_Client.php +++ b/framework/main/interfaces/client/class_Client.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/client/class_Client.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/client/class_Client.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/compressor/class_Compressor.php b/framework/main/interfaces/compressor/class_Compressor.php index 1f9270ad..cae3105e 100644 --- a/framework/main/interfaces/compressor/class_Compressor.php +++ b/framework/main/interfaces/compressor/class_Compressor.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/compressor/class_Compressor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/compressor/class_Compressor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/controller/class_Controller.php b/framework/main/interfaces/controller/class_Controller.php index 30239686..8c5c9479 100644 --- a/framework/main/interfaces/controller/class_Controller.php +++ b/framework/main/interfaces/controller/class_Controller.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/controller/class_Controller.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/controller/class_Controller.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/criteria/class_Criteria.php b/framework/main/interfaces/criteria/class_Criteria.php index ae646cd4..f3bcf61a 100644 --- a/framework/main/interfaces/criteria/class_Criteria.php +++ b/framework/main/interfaces/criteria/class_Criteria.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/criteria/class_Criteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/criteria/class_Criteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php index df52c7e1..d057ceab 100644 --- a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php +++ b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_AddableCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_AddableCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php index 10ee38ad..cc0b0747 100644 --- a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php +++ b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php index f851ad83..2657e2a8 100644 --- a/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php +++ b/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php index f183a6ad..ebc067b7 100644 --- a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php +++ b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_StoreableCriteria.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_StoreableCriteria.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/crypto/class_Cryptable.php b/framework/main/interfaces/crypto/class_Cryptable.php index 890b0d32..54e6ce4c 100644 --- a/framework/main/interfaces/crypto/class_Cryptable.php +++ b/framework/main/interfaces/crypto/class_Cryptable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/crypto/class_Cryptable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/crypto/class_Cryptable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/backend/class_DatabaseBackend.php b/framework/main/interfaces/database/backend/class_DatabaseBackend.php index 13f2c61c..a354bb15 100644 --- a/framework/main/interfaces/database/backend/class_DatabaseBackend.php +++ b/framework/main/interfaces/database/backend/class_DatabaseBackend.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/backend/class_DatabaseBackend.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/backend/class_DatabaseBackend.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/class_DatabaseWrapper.php b/framework/main/interfaces/database/class_DatabaseWrapper.php index e314256b..401e85fd 100644 --- a/framework/main/interfaces/database/class_DatabaseWrapper.php +++ b/framework/main/interfaces/database/class_DatabaseWrapper.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/class_DatabaseWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/class_DatabaseWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/class_FrameworkDatabase.php b/framework/main/interfaces/database/class_FrameworkDatabase.php index dcf2e244..032dd820 100644 --- a/framework/main/interfaces/database/class_FrameworkDatabase.php +++ b/framework/main/interfaces/database/class_FrameworkDatabase.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/class_FrameworkDatabase.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/class_FrameworkDatabase.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/class_Updateable.php b/framework/main/interfaces/database/class_Updateable.php index 6fd4c1bb..73c093c0 100644 --- a/framework/main/interfaces/database/class_Updateable.php +++ b/framework/main/interfaces/database/class_Updateable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/class_Updateable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/class_Updateable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php index 21ca43ff..bcc43a3b 100644 --- a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php +++ b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/middleware/class_DatabaseConnector.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/middleware/class_DatabaseConnector.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php index e57a7459..223eab79 100644 --- a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php +++ b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php index 7c90ca6d..b39347ab 100644 --- a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php +++ b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/debug/class_Debugger.php b/framework/main/interfaces/debug/class_Debugger.php index 4ce86a65..ab90dff4 100644 --- a/framework/main/interfaces/debug/class_Debugger.php +++ b/framework/main/interfaces/debug/class_Debugger.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/debug/class_Debugger.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/debug/class_Debugger.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/discovery/class_Discoverable.php b/framework/main/interfaces/discovery/class_Discoverable.php index 06fe8796..88e8a4fd 100644 --- a/framework/main/interfaces/discovery/class_Discoverable.php +++ b/framework/main/interfaces/discovery/class_Discoverable.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/discovery/class_Discoverable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/discovery/class_Discoverable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/feature/class_Feature.php b/framework/main/interfaces/feature/class_Feature.php index 42acc363..35a6e7ed 100644 --- a/framework/main/interfaces/feature/class_Feature.php +++ b/framework/main/interfaces/feature/class_Feature.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/feature/class_Feature.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/feature/class_Feature.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/filesystem/class_Filesystem.php b/framework/main/interfaces/filesystem/class_Filesystem.php index 2a8ed806..72d61d5b 100644 --- a/framework/main/interfaces/filesystem/class_Filesystem.php +++ b/framework/main/interfaces/filesystem/class_Filesystem.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/filesystem/class_Filesystem.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/filesystem/class_Filesystem.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/filter/class_Filterable.php b/framework/main/interfaces/filter/class_Filterable.php index 81927529..6954bd7d 100644 --- a/framework/main/interfaces/filter/class_Filterable.php +++ b/framework/main/interfaces/filter/class_Filterable.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/filter/class_Filterable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/filter/class_Filterable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/handler/class_Handleable.php b/framework/main/interfaces/handler/class_Handleable.php index da13e865..e334c4fa 100644 --- a/framework/main/interfaces/handler/class_Handleable.php +++ b/framework/main/interfaces/handler/class_Handleable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/handler/class_Handleable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/handler/class_Handleable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/handler/class_HandleableDataSet.php b/framework/main/interfaces/handler/class_HandleableDataSet.php index b2fea4f4..ade59e73 100644 --- a/framework/main/interfaces/handler/class_HandleableDataSet.php +++ b/framework/main/interfaces/handler/class_HandleableDataSet.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Handler\Handleable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/handler/class_HandleableDataSet.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/handler/class_HandleableDataSet.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/handler/task/class_HandleableTask.php b/framework/main/interfaces/handler/task/class_HandleableTask.php index db0c8a02..b19e5f30 100644 --- a/framework/main/interfaces/handler/task/class_HandleableTask.php +++ b/framework/main/interfaces/handler/task/class_HandleableTask.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/handler/task/class_HandleableTask.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/handler/task/class_HandleableTask.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo HandleableDataSet looks strange here diff --git a/framework/main/interfaces/helper/class_Helper.php b/framework/main/interfaces/helper/class_Helper.php index dea2550f..e6284ad5 100644 --- a/framework/main/interfaces/helper/class_Helper.php +++ b/framework/main/interfaces/helper/class_Helper.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/helper/class_Helper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/helper/class_Helper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/helper/login/class_HelpableLogin.php b/framework/main/interfaces/helper/login/class_HelpableLogin.php index c81982b3..95345a29 100644 --- a/framework/main/interfaces/helper/login/class_HelpableLogin.php +++ b/framework/main/interfaces/helper/login/class_HelpableLogin.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/helper/login/class_HelpableLogin.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/helper/login/class_HelpableLogin.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/helper/template/class_HelpableTemplate.php b/framework/main/interfaces/helper/template/class_HelpableTemplate.php index 5122260e..63848249 100644 --- a/framework/main/interfaces/helper/template/class_HelpableTemplate.php +++ b/framework/main/interfaces/helper/template/class_HelpableTemplate.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Helper; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/helper/template/class_HelpableTemplate.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/helper/template/class_HelpableTemplate.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/index/class_Indexable b/framework/main/interfaces/index/class_Indexable index 68242260..ce6f2fb3 100644 --- a/framework/main/interfaces/index/class_Indexable +++ b/framework/main/interfaces/index/class_Indexable @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/index/class_Indexable * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/index/class_Indexable * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/index/class_Indexable.php b/framework/main/interfaces/index/class_Indexable.php index c9263284..fdf5aa93 100644 --- a/framework/main/interfaces/index/class_Indexable.php +++ b/framework/main/interfaces/index/class_Indexable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/index/class_Indexable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/index/class_Indexable.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/index/stack/class_IndexableStack.php b/framework/main/interfaces/index/stack/class_IndexableStack.php index 6fa47bc3..b6051190 100644 --- a/framework/main/interfaces/index/stack/class_IndexableStack.php +++ b/framework/main/interfaces/index/stack/class_IndexableStack.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/index/stack/class_IndexableStack.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/index/stack/class_IndexableStack.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/io/class_CloseableFile.php b/framework/main/interfaces/io/class_CloseableFile.php index ebfc1c3c..44a02b7c 100644 --- a/framework/main/interfaces/io/class_CloseableFile.php +++ b/framework/main/interfaces/io/class_CloseableFile.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/class_CloseableFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/class_CloseableFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/class_FilePointer.php b/framework/main/interfaces/io/class_FilePointer.php index 124a8b06..29e579f1 100644 --- a/framework/main/interfaces/io/class_FilePointer.php +++ b/framework/main/interfaces/io/class_FilePointer.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/class_FilePointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/class_FilePointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/class_Streamable.php b/framework/main/interfaces/io/class_Streamable.php index 2dea38dc..79d6e7bc 100644 --- a/framework/main/interfaces/io/class_Streamable.php +++ b/framework/main/interfaces/io/class_Streamable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/class_Streamable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/class_Streamable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/class_StreamableInput.php b/framework/main/interfaces/io/class_StreamableInput.php index b3806d63..530acff5 100644 --- a/framework/main/interfaces/io/class_StreamableInput.php +++ b/framework/main/interfaces/io/class_StreamableInput.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Streamable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/class_StreamableInput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/class_StreamableInput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/class_StreamableOutput.php b/framework/main/interfaces/io/class_StreamableOutput.php index f27d344a..a5efa3ad 100644 --- a/framework/main/interfaces/io/class_StreamableOutput.php +++ b/framework/main/interfaces/io/class_StreamableOutput.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Streamable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/class_StreamableOutput.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/class_StreamableOutput.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/directory/class_FrameworkDirectory.php b/framework/main/interfaces/io/directory/class_FrameworkDirectory.php index a87ba801..83b2c32d 100644 --- a/framework/main/interfaces/io/directory/class_FrameworkDirectory.php +++ b/framework/main/interfaces/io/directory/class_FrameworkDirectory.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/directory/class_FrameworkDirectory.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/directory/class_FrameworkDirectory.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/file/class_FileInputStreamer.php b/framework/main/interfaces/io/file/class_FileInputStreamer.php index 953f07bc..bd5247d8 100644 --- a/framework/main/interfaces/io/file/class_FileInputStreamer.php +++ b/framework/main/interfaces/io/file/class_FileInputStreamer.php @@ -13,7 +13,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/file/class_FileInputStreamer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/file/class_FileInputStreamer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/file/class_FileOutputStreamer.php b/framework/main/interfaces/io/file/class_FileOutputStreamer.php index 8b08e882..9bc30c6e 100644 --- a/framework/main/interfaces/io/file/class_FileOutputStreamer.php +++ b/framework/main/interfaces/io/file/class_FileOutputStreamer.php @@ -13,7 +13,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/file/class_FileOutputStreamer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/file/class_FileOutputStreamer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php index 8e9885a9..3de7eacd 100644 --- a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php +++ b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Filesystem\FileInputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/file/csv/class_CsvInputStreamer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/file/handler/class_IoHandler.php b/framework/main/interfaces/io/file/handler/class_IoHandler.php index d726372b..8d095b86 100644 --- a/framework/main/interfaces/io/file/handler/class_IoHandler.php +++ b/framework/main/interfaces/io/file/handler/class_IoHandler.php @@ -15,7 +15,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/file/handler/class_IoHandler.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/file/handler/class_IoHandler.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/output/class_OutputStreamer.php b/framework/main/interfaces/io/output/class_OutputStreamer.php index a98d185c..eb968405 100644 --- a/framework/main/interfaces/io/output/class_OutputStreamer.php +++ b/framework/main/interfaces/io/output/class_OutputStreamer.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\StreamableOutput; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/output/class_OutputStreamer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/output/class_OutputStreamer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/pointer/class_InputPointer.php b/framework/main/interfaces/io/pointer/class_InputPointer.php index 334ed78c..d5d1ed45 100644 --- a/framework/main/interfaces/io/pointer/class_InputPointer.php +++ b/framework/main/interfaces/io/pointer/class_InputPointer.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stream\Input\StreamableInput; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/pointer/class_InputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/pointer/class_InputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/pointer/class_OutputPointer.php b/framework/main/interfaces/io/pointer/class_OutputPointer.php index 403e6625..bda35da8 100644 --- a/framework/main/interfaces/io/pointer/class_OutputPointer.php +++ b/framework/main/interfaces/io/pointer/class_OutputPointer.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\StreamableOutput; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/pointer/class_OutputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/pointer/class_OutputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php index 4d361616..ea718700 100644 --- a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php +++ b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Filesystem\Pointer\OutputPointer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/io/pointer/io/class_InputOutputPointer.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php index d134ff36..ad24331e 100644 --- a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php +++ b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php @@ -11,7 +11,11 @@ use \SeekableIterator; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/iterator/class_SeekableWritableFileIterator.php * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/framework/main/interfaces/language/class_ManageableLanguage.php b/framework/main/interfaces/language/class_ManageableLanguage.php index faf9fa25..8b097d33 100644 --- a/framework/main/interfaces/language/class_ManageableLanguage.php +++ b/framework/main/interfaces/language/class_ManageableLanguage.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/language/class_ManageableLanguage.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/language/class_ManageableLanguage.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/lists/class_Listable.php b/framework/main/interfaces/lists/class_Listable.php index 16f1bd7a..1df8c4de 100644 --- a/framework/main/interfaces/lists/class_Listable.php +++ b/framework/main/interfaces/lists/class_Listable.php @@ -14,7 +14,11 @@ use \IteratorAggregate; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/lists/class_Listable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/lists/class_Listable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/login/class_LoginableUser.php b/framework/main/interfaces/login/class_LoginableUser.php index eb1edccd..c71df7f5 100644 --- a/framework/main/interfaces/login/class_LoginableUser.php +++ b/framework/main/interfaces/login/class_LoginableUser.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/login/class_LoginableUser.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/login/class_LoginableUser.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/mailer/class_DeliverableMail.php b/framework/main/interfaces/mailer/class_DeliverableMail.php index b0727de2..fe406818 100644 --- a/framework/main/interfaces/mailer/class_DeliverableMail.php +++ b/framework/main/interfaces/mailer/class_DeliverableMail.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/mailer/class_DeliverableMail.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/mailer/class_DeliverableMail.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/parser/class_Parseable.php b/framework/main/interfaces/parser/class_Parseable.php index 3f9636ef..305ffab2 100644 --- a/framework/main/interfaces/parser/class_Parseable.php +++ b/framework/main/interfaces/parser/class_Parseable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/parser/class_Parseable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/parser/class_Parseable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/points/class_BookablePoints.php b/framework/main/interfaces/points/class_BookablePoints.php index 0ede2556..bfe36a01 100644 --- a/framework/main/interfaces/points/class_BookablePoints.php +++ b/framework/main/interfaces/points/class_BookablePoints.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/points/class_BookablePoints.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/points/class_BookablePoints.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/reader/class_ReadableNews.php b/framework/main/interfaces/reader/class_ReadableNews.php index c206cff8..ce1d16e0 100644 --- a/framework/main/interfaces/reader/class_ReadableNews.php +++ b/framework/main/interfaces/reader/class_ReadableNews.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/reader/class_ReadableNews.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/reader/class_ReadableNews.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/registration/class_UserRegister.php b/framework/main/interfaces/registration/class_UserRegister.php index 9503525e..eda82f6e 100644 --- a/framework/main/interfaces/registration/class_UserRegister.php +++ b/framework/main/interfaces/registration/class_UserRegister.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/registration/class_UserRegister.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/registration/class_UserRegister.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/registry/class_Register.php b/framework/main/interfaces/registry/class_Register.php index 177be139..4be9dfda 100644 --- a/framework/main/interfaces/registry/class_Register.php +++ b/framework/main/interfaces/registry/class_Register.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/registry/class_Register.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/registry/class_Register.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/registry/class_Registerable.php b/framework/main/interfaces/registry/class_Registerable.php index 8106d413..ef42c5aa 100644 --- a/framework/main/interfaces/registry/class_Registerable.php +++ b/framework/main/interfaces/registry/class_Registerable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/registry/class_Registerable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/registry/class_Registerable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/request/class_Requestable.php b/framework/main/interfaces/request/class_Requestable.php index 1f33bcc3..755a3610 100644 --- a/framework/main/interfaces/request/class_Requestable.php +++ b/framework/main/interfaces/request/class_Requestable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/request/class_Requestable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/request/class_Requestable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/resolver/actions/class_ActionResolver.php b/framework/main/interfaces/resolver/actions/class_ActionResolver.php index 80f06b9c..3af3fe22 100644 --- a/framework/main/interfaces/resolver/actions/class_ActionResolver.php +++ b/framework/main/interfaces/resolver/actions/class_ActionResolver.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/resolver/actions/class_ActionResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/resolver/actions/class_ActionResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/resolver/class_Resolver.php b/framework/main/interfaces/resolver/class_Resolver.php index 711fdc79..2e8135cf 100644 --- a/framework/main/interfaces/resolver/class_Resolver.php +++ b/framework/main/interfaces/resolver/class_Resolver.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/resolver/class_Resolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/resolver/class_Resolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/resolver/commands/class_CommandResolver.php b/framework/main/interfaces/resolver/commands/class_CommandResolver.php index 87f56a60..967b5022 100644 --- a/framework/main/interfaces/resolver/commands/class_CommandResolver.php +++ b/framework/main/interfaces/resolver/commands/class_CommandResolver.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/resolver/commands/class_CommandResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/resolver/commands/class_CommandResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php index daac133c..99777c04 100644 --- a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php +++ b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/resolver/controller/class_ControllerResolver.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/resolver/controller/class_ControllerResolver.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/response/class_Responseable.php b/framework/main/interfaces/response/class_Responseable.php index a7708eb8..341bf8e8 100644 --- a/framework/main/interfaces/response/class_Responseable.php +++ b/framework/main/interfaces/response/class_Responseable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/response/class_Responseable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/response/class_Responseable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/result/class_SearchableResult.php b/framework/main/interfaces/result/class_SearchableResult.php index 2daead2c..186d3d1b 100644 --- a/framework/main/interfaces/result/class_SearchableResult.php +++ b/framework/main/interfaces/result/class_SearchableResult.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/result/class_SearchableResult.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/result/class_SearchableResult.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/result/class_UpdateableResult.php b/framework/main/interfaces/result/class_UpdateableResult.php index 66968da1..21c5970b 100644 --- a/framework/main/interfaces/result/class_UpdateableResult.php +++ b/framework/main/interfaces/result/class_UpdateableResult.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/result/class_UpdateableResult.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/result/class_UpdateableResult.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/stacker/class_Stackable.php b/framework/main/interfaces/stacker/class_Stackable.php index b1e78397..8cdb6e7d 100644 --- a/framework/main/interfaces/stacker/class_Stackable.php +++ b/framework/main/interfaces/stacker/class_Stackable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/stacker/class_Stackable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/stacker/class_Stackable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/stacker/file/class_StackableFile.php b/framework/main/interfaces/stacker/file/class_StackableFile.php index c3f9ebc9..b4526e21 100644 --- a/framework/main/interfaces/stacker/file/class_StackableFile.php +++ b/framework/main/interfaces/stacker/file/class_StackableFile.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/stacker/file/class_StackableFile.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/stacker/file/class_StackableFile.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/state/class_Stateable.php b/framework/main/interfaces/state/class_Stateable.php index b3954b9f..16ab5ae0 100644 --- a/framework/main/interfaces/state/class_Stateable.php +++ b/framework/main/interfaces/state/class_Stateable.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/state/class_Stateable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/state/class_Stateable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/streams/class_Stream.php b/framework/main/interfaces/streams/class_Stream.php index 212c2eba..966eb361 100644 --- a/framework/main/interfaces/streams/class_Stream.php +++ b/framework/main/interfaces/streams/class_Stream.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/streams/class_Stream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/streams/class_Stream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php index 7f20dc66..9f95492e 100644 --- a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php +++ b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/streams/crypto/class_EncryptableStream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/streams/crypto/class_EncryptableStream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/streams/input/class_InputStream.php b/framework/main/interfaces/streams/input/class_InputStream.php index 7f3632d9..f9677fa2 100644 --- a/framework/main/interfaces/streams/input/class_InputStream.php +++ b/framework/main/interfaces/streams/input/class_InputStream.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/streams/input/class_InputStream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/streams/input/class_InputStream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/streams/output/class_OutputStream.php b/framework/main/interfaces/streams/output/class_OutputStream.php index 1cb286f7..dd841f45 100644 --- a/framework/main/interfaces/streams/output/class_OutputStream.php +++ b/framework/main/interfaces/streams/output/class_OutputStream.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/streams/output/class_OutputStream.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/streams/output/class_OutputStream.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/tasks/class_Taskable.php b/framework/main/interfaces/tasks/class_Taskable.php index 9bed5eca..4c57b583 100644 --- a/framework/main/interfaces/tasks/class_Taskable.php +++ b/framework/main/interfaces/tasks/class_Taskable.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/tasks/class_Taskable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/tasks/class_Taskable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/template/class_CompileableTemplate.php b/framework/main/interfaces/template/class_CompileableTemplate.php index 480a25af..761e5619 100644 --- a/framework/main/interfaces/template/class_CompileableTemplate.php +++ b/framework/main/interfaces/template/class_CompileableTemplate.php @@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/template/class_CompileableTemplate.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/template/class_CompileableTemplate.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/template/view/class_ViewHelper.php b/framework/main/interfaces/template/view/class_ViewHelper.php index c9b43ab4..5123be45 100644 --- a/framework/main/interfaces/template/view/class_ViewHelper.php +++ b/framework/main/interfaces/template/view/class_ViewHelper.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/template/view/class_ViewHelper.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/template/view/class_ViewHelper.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/user/class_ManageableAccount.php b/framework/main/interfaces/user/class_ManageableAccount.php index fd61d1ad..d84ec446 100644 --- a/framework/main/interfaces/user/class_ManageableAccount.php +++ b/framework/main/interfaces/user/class_ManageableAccount.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/user/class_ManageableAccount.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/user/class_ManageableAccount.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/user/extended/class_ManageableGuest.php b/framework/main/interfaces/user/extended/class_ManageableGuest.php index 8de61d82..36821091 100644 --- a/framework/main/interfaces/user/extended/class_ManageableGuest.php +++ b/framework/main/interfaces/user/extended/class_ManageableGuest.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/user/extended/class_ManageableGuest.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/user/extended/class_ManageableGuest.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/user/extended/class_ManageableMember.php b/framework/main/interfaces/user/extended/class_ManageableMember.php index c7e247a8..1eac1454 100644 --- a/framework/main/interfaces/user/extended/class_ManageableMember.php +++ b/framework/main/interfaces/user/extended/class_ManageableMember.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/user/extended/class_ManageableMember.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/user/extended/class_ManageableMember.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/visitor/class_Visitable.php b/framework/main/interfaces/visitor/class_Visitable.php index 5af53561..c90e118a 100644 --- a/framework/main/interfaces/visitor/class_Visitable.php +++ b/framework/main/interfaces/visitor/class_Visitable.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/visitor/class_Visitable.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/visitor/class_Visitable.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/visitor/class_Visitor.php b/framework/main/interfaces/visitor/class_Visitor.php index c968f9fa..13b72c99 100644 --- a/framework/main/interfaces/visitor/class_Visitor.php +++ b/framework/main/interfaces/visitor/class_Visitor.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/visitor/class_Visitor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/visitor/class_Visitor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php index 3d9617e9..9c79170e 100644 --- a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php +++ b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/visitor/decorator/class_DecoratorVisitor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php index 5a6708e2..e595f646 100644 --- a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php +++ b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php @@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/interfaces/visitor/tasks/class_TaskVisitor.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/interfaces/visitor/tasks/class_TaskVisitor.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/middleware/class_BaseMiddleware.php b/framework/main/middleware/class_BaseMiddleware.php index 589b8876..2009af0f 100644 --- a/framework/main/middleware/class_BaseMiddleware.php +++ b/framework/main/middleware/class_BaseMiddleware.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/middleware/class_BaseMiddleware.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/middleware/class_BaseMiddleware.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/middleware/compressor/class_CompressorChannel.php b/framework/main/middleware/compressor/class_CompressorChannel.php index 8ec776d9..622244dc 100644 --- a/framework/main/middleware/compressor/class_CompressorChannel.php +++ b/framework/main/middleware/compressor/class_CompressorChannel.php @@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/middleware/compressor/class_CompressorChannel.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/middleware/compressor/class_CompressorChannel.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/middleware/database/class_DatabaseConnection.php b/framework/main/middleware/database/class_DatabaseConnection.php index 83b13eb5..5754b745 100644 --- a/framework/main/middleware/database/class_DatabaseConnection.php +++ b/framework/main/middleware/database/class_DatabaseConnection.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/middleware/database/class_DatabaseConnection.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/middleware/database/class_DatabaseConnection.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/middleware/debug/class_DebugMiddleware.php b/framework/main/middleware/debug/class_DebugMiddleware.php index a4855e5d..59dbba4e 100644 --- a/framework/main/middleware/debug/class_DebugMiddleware.php +++ b/framework/main/middleware/debug/class_DebugMiddleware.php @@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/middleware/debug/class_DebugMiddleware.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/middleware/debug/class_DebugMiddleware.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @deprecated See LoggerFactory for a more flexible approach diff --git a/framework/main/middleware/io/class_FileIoHandler.php b/framework/main/middleware/io/class_FileIoHandler.php index 35015194..02c80344 100644 --- a/framework/main/middleware/io/class_FileIoHandler.php +++ b/framework/main/middleware/io/class_FileIoHandler.php @@ -20,7 +20,11 @@ use \SplFileInfo; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/middleware/io/class_FileIoHandler.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/middleware/io/class_FileIoHandler.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/framework/main/third_party/api/wernisportal/class_WernisApi.php b/framework/main/third_party/api/wernisportal/class_WernisApi.php index cb85170a..f217f103 100644 --- a/framework/main/third_party/api/wernisportal/class_WernisApi.php +++ b/framework/main/third_party/api/wernisportal/class_WernisApi.php @@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 +<<<<<<< HEAD:framework/main/third_party/api/wernisportal/class_WernisApi.php * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team +======= + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team +>>>>>>> Some updates::inc/main/third_party/api/wernisportal/class_WernisApi.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo Out-dated since 0.6-BETA diff --git a/inc/config.php b/inc/config.php new file mode 100644 index 00000000..5cc93a13 --- /dev/null +++ b/inc/config.php @@ -0,0 +1,474 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Load very basic classes, required to bootstrap +require(ApplicationEntryPoint::detectCorePath() . '/inc/main/interfaces/class_FrameworkInterface.php'); +require(ApplicationEntryPoint::detectCorePath() . '/inc/main/interfaces/registry/class_Registerable.php'); +require(ApplicationEntryPoint::detectCorePath() . '/inc/config/class_FrameworkConfiguration.php'); + +// Get a new configuration instance +$cfg = FrameworkConfiguration::getSelfInstance(); + +// CFG: SERVER-PATH +$cfg->setConfigEntry('base_path', ApplicationEntryPoint::detectCorePath() . '/'); + +// CFG: BASE-URL +$cfg->setConfigEntry('base_url', $cfg->detectBaseUrl()); + +// CFG: DATABASE-TYPE +$cfg->setConfigEntry('db_type', 'local'); + +// CFG: LOCAL-DB-PATH +$cfg->setConfigEntry('local_db_path', $cfg->getConfigEntry('base_path') . 'db/'); + +// CFG: TIME-ZONE +$cfg->setDefaultTimezone('Europe/Berlin'); + +// CFG: MAGIC-QUOTES-RUNTIME +$cfg->setMagicQuotesRuntime(FALSE); + +// CFG: CLASS-PREFIX +$cfg->setConfigEntry('class_prefix', 'class_'); + +// CFG: CLASS-SUFFIX +$cfg->setConfigEntry('class_suffix', '.php'); + +// CFG: RAW-TEMPLATE-EXTENSION +$cfg->setConfigEntry('raw_template_extension', '.tpl'); + +// CFG: CODE-TEMPLATE-EXTENSION +$cfg->setConfigEntry('code_template_extension', '.ctp'); + +// CFG: SELECTOR-PATH +$cfg->setConfigEntry('selector_path', 'selector'); + +// CFG: APPLICATION-HELPER-CLASS +$cfg->setConfigEntry('app_helper_class', 'ApplicationHelper'); + +// CFG: LAUNCH-METHOD +$cfg->setConfigEntry('entry_method', 'entryPoint'); + +// CFG: TEMPLATE-BASE-PATH +$cfg->setConfigEntry('tpl_base_path', 'templates/'); + +// CFG: LANGUAGE-BASE-PATH +$cfg->setConfigEntry('lang_base_path', 'inc/language/'); + +// CFG: COMPRESSOR-BASE-PATH +$cfg->setConfigEntry('compressor_base_path', 'inc/main/classes/compressor/'); + +// CFG: APPLICATION-BASE-PATH +$cfg->setConfigEntry('application_base_path', 'application/'); + +// CFG: APPLICATION-PATH +$cfg->setConfigEntry('application_path', $cfg->getConfigEntry('base_path') . $cfg->getConfigEntry('application_base_path')); + +// CFG: COMPILE-OUTPUT-PATH +$cfg->setConfigEntry('compile_output_path', 'templates/_compiled/'); + +// CFG: HTML-TEMPLATE-CLASS +$cfg->setConfigEntry('html_template_class', 'HtmlTemplateEngine'); + +// CFG: DECO-XML-REWRITER-TEMPLATE-CLASS +$cfg->setConfigEntry('deco_xml_rewriter_template_class', 'XmlRewriterTemplateDecorator'); + +// CFG: DEBUG-HTML-CLASS +$cfg->setConfigEntry('debug_html_class', 'DebugWebOutput'); + +// CFG: DEBUG-CONSOLE-CLASS +$cfg->setConfigEntry('debug_console_class', 'DebugConsoleOutput'); + +// CFG: DEFAULT-LANGUAGE +$cfg->setConfigEntry('default_lang', 'de'); // A two-char language string: de for german, en for english and so on + +// CFG: HTML-TEMPLATE-TYPE +$cfg->setConfigEntry('html_template_type', 'html'); + +// CFG: EMAIL-TEMPLATE-TYPE +$cfg->setConfigEntry('email_template_type', 'emails'); + +// CFG: CODE-HTML-TEMPLATE-TYPE +$cfg->setConfigEntry('code_html_template_type', 'code'); + +// CFG: CODE-CONSOLE-TEMPLATE-TYPE +$cfg->setConfigEntry('code_console_template_type', 'xml'); + +// CFG: IMAGE-TEMPLATE-TYPE +$cfg->setConfigEntry('image_template_type', 'image'); + +// CFG: MENU-TEMPLATE-TYPE +$cfg->setConfigEntry('menu_template_type', 'menu'); + +// CFG: OUTPUT-CLASS +$cfg->setConfigEntry('output_class', 'WebOutput'); + +// CFG: LANGUAGE-SYSTEM-CLASS +$cfg->setConfigEntry('language_system_class', 'LanguageSystem'); + +// CFG: SELECTOR-TEMPLATE-PREFIX +$cfg->setConfigEntry('tpl_selector_prefix', 'selector'); + +// CFG: WEB-CONTENT-TYPE +$cfg->setConfigEntry('web_content_type', 'text/html'); + +// CFG: VALID-TEMPLATE-VARIABLE +$cfg->setConfigEntry('tpl_valid_var', 'content'); + +// CFG: META-AUTHOR +$cfg->setConfigEntry('meta_author', 'Your-name-here'); + +// CFG: META-PUBLISHER +$cfg->setConfigEntry('meta_publisher', 'Your-name-here'); + +// CFG: META-KEYWORDS +$cfg->setConfigEntry('meta_keywords', 'test,test,test'); + +// CFG: META-DESCRIPTION +$cfg->setConfigEntry('meta_description', 'A description for your website'); + +// CFG: SELECTOR-MAIN-TEMPLATE +$cfg->setConfigEntry('selector_main_tpl', 'selector_main'); + +// CFG: SELECTOR-APPS-TEMPLATE +$cfg->setConfigEntry('selector_apps_tpl', 'selector_apps'); + +// CFG: SELECTOR-NAME +$cfg->setConfigEntry('selector_name', 'selector'); + +// CFG: DEFAULT-APPLICATION +$cfg->setConfigEntry('default_application', 'selector'); + +// CFG: VERBOSE-LEVEL +$cfg->setConfigEntry('verbose_level', 0); + +// CFG: CACHE-CLASS +$cfg->setConfigEntry('cache_class', 'MemoryCache'); + +// CFG: SEARCH-CRITERIA-CLASS +$cfg->setConfigEntry('search_criteria_class', 'SearchCriteria'); + +// CFG: DATASET-CRITERIA-CLASS +$cfg->setConfigEntry('dataset_criteria_class', 'DataSetCriteria'); + +// CFG: UPDATE-CRITERIA-CLASS +$cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria'); + +// CFG: FILE-IO-CLASS +$cfg->setConfigEntry('file_io_class', 'FileIoHandler'); + +// CFG: DATABASE-RESULT-CLASS +$cfg->setConfigEntry('database_result_class', 'CachedDatabaseResult'); + +// CFG: FILTER-CHAIN-CLASS +$cfg->setConfigEntry('filter_chain_class', 'FilterChain'); + +// CFG: FILE-INPUT-CLASS +$cfg->setConfigEntry('file_input_class', 'FileIoStream'); + +// CFG: FILE-OUTPUT-CLASS +$cfg->setConfigEntry('file_output_class', 'FileIoStream'); + +// CFG: EMAIL-VALIDATOR-FILTER +$cfg->setConfigEntry('email_validator_filter', 'EmailValidatorFilter'); + +// CFG: USERNAME-VALIDATOR-FILTER +$cfg->setConfigEntry('username_validator_filter', 'UserNameValidatorFilter'); + +// CFG: USERNAME-IS-GUEST-FILTER +$cfg->setConfigEntry('username_is_guest_filter', 'UserNameIsGuestFilter'); + +// CFG: PASSWORD-VALIDATOR-FILTER +$cfg->setConfigEntry('password_validator_filter', 'PasswordValidatorFilter'); + +// CFG: RULES-ACCEPTED-FILTER +$cfg->setConfigEntry('rules_accepted_filter', 'RulesAcceptedFilter'); + +// CFG: USERNAME-VERIFIER-FILTER +$cfg->setConfigEntry('username_verifier_filter', 'UserNameVerifierFilter'); + +// CFG: USER-GUEST-VERIFIER-FILTER +$cfg->setConfigEntry('user_guest_verifier_filter', 'UserGuestVerifierFilter'); + +// CFG: EMAIL-VERIFIER-FILTER +$cfg->setConfigEntry('email_verifier_filter', 'EmailVerifierFilter'); + +// CFG: PASSWORD-VERIFIER-FILTER +$cfg->setConfigEntry('password_verifier_filter', 'PasswordVerifierFilter'); + +// CFG: PASSWD-GUEST-VERIFIER-FILTER +$cfg->setConfigEntry('passwd_guest_verifier_filter', 'PasswordGuestVerifierFilter'); + +// CFG: EMAIL-CHANGE-FILTER +$cfg->setConfigEntry('email_change_filter', 'EmailChangeFilter'); + +// CFG: PASSWORD-CHANGE-FILTER +$cfg->setConfigEntry('password_change_filter', 'PasswordChangeFilter'); + +// CFG: ACCOUNT-PASSWORD-FILTER +$cfg->setConfigEntry('account_password_filter', 'AccountPasswordVerifierFilter'); + +// CFG: USER-STATUS-FILTER +$cfg->setConfigEntry('user_status_filter', 'UserStatusVerifierFilter'); + +// CFG: USER-UNCONFIRMED-FILTER +$cfg->setConfigEntry('user_unconfirmed_filter', 'UserUnconfirmedVerifierFilter'); + +// CFG: CRYPTO-CLASS +$cfg->setConfigEntry('crypto_class', 'CryptoHelper'); + +// CFG: RNG-CLASS +$cfg->setConfigEntry('rng_class', 'RandomNumberGenerator'); + +// CFG: USER-DB-WRAPPER-CLASS +$cfg->setConfigEntry('user_db_wrapper_class', 'UserDatabaseWrapper'); + +// CFG: NEWS-DB-WRAPPER-CLASS +$cfg->setConfigEntry('news_db_wrapper_class', 'NewsDatabaseWrapper'); + +// CFG: HTML-CMD-RESOLVER-CLASS +$cfg->setConfigEntry('html_cmd_resolver_class', 'HtmlCommandResolver'); + +// CFG: HTML-CMD-LOGIN-RESOLVER-CLASS +$cfg->setConfigEntry('html_cmd_login_resolver_class', 'HtmlCommandResolver'); + +// CFG: IMAGE-CMD-RESOLVER-CLASS +$cfg->setConfigEntry('image_cmd_resolver_class', 'ImageCommandResolver'); + +// CFG: IMAGE-CMD-CODE-CAPTCHA-RESOLVER-CLASS +$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'ImageCommandResolver'); + +// CFG: MAILER-CLASS +$cfg->setConfigEntry('mailer_class', 'DebugMailer'); + +// CFG: XML-PARSER-CLASS +$cfg->setConfigEntry('xml_parser_class', 'XmlParser'); + +// CFG: DECO-COMPACTING-XML-PARSER-CLASS +$cfg->setConfigEntry('deco_compacting_xml_parser_class', 'XmlCompactorDecorator'); + +// CFG: MATH-PRIME +$cfg->setConfigEntry('math_prime', 591623); + +// CFG: DATE-KEY +$cfg->setConfigEntry('date_key', date('d-m-Y (l-F-T)', time())); + +// CFG: SALT-LENGTH +$cfg->setConfigEntry('salt_length', 10); + +// CFG: RND-STR-LENGTH +$cfg->setConfigEntry('rnd_str_length', 128); + +// CFG: HASH-EXTRA-MASK +$cfg->setConfigEntry('hash_extra_mask', "%1s:%2s:%3s"); // 1=salt, 2=extra salt, 3=plain password/string + +// CFG: HASH-NORMAL-MASK +$cfg->setConfigEntry('hash_normal_mask', "%1s:%2s"); // 1=salt, 2=plain password/string + +// CFG: IS-SINGLE-SERVER +$cfg->setConfigEntry('is_single_server', 'Y'); + +// CFG: POST-REGISTRATION-CLASS +$cfg->setConfigEntry('post_registration_class', 'LoginAfterRegistrationAction'); + +// CFG: USER-CLASS +$cfg->setConfigEntry('user_class', 'Member'); + +// CFG: GUEST-CLASS +$cfg->setConfigEntry('guest_class', 'Guest'); + +// CFG: COOKIE-EXPIRE +$cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours! + +// CFG: COOKIE-PATH +$cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . '/'); + +// CFG: COOKIE-DOMAIN +$cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same... + +// CFG: COOKIE-SSL +$cfg->setConfigEntry('cookie_ssl', $cfg->isHttpSecured()); + +// CFG: CRYPT-FIXED-SALT +$cfg->setConfigEntry('crypt_fixed_salt', 'N'); + +// CFG: DB-UPDATE-PRIMARY-FORCED +$cfg->setConfigEntry('db_update_primary_forced', 'Y'); + +// CFG: GERMAN-DATE-TIME +$cfg->setConfigEntry('german_date_time', "%3\$s.%2\$s.%1\$s, %4\$s:%5\$s:%6\$s"); + +// CFG: PRODUCT-INSTALL-MODE +$cfg->setConfigEntry('product_install_mode', 'debug'); + +// CFG: DECIMALS +$cfg->setConfigEntry('decimals', 3); + +// CFG: MENU-STACKER-CLASS +$cfg->setConfigEntry('menu_stacker_class', 'FiLoStacker'); + +// CFG: STACKER-GENERIC-MAX-SIZE +$cfg->setConfigEntry('stacker_generic_max_size', 100); + +// CFG: STACKER-CURRENT-NODE-MAX-SIZE +$cfg->setConfigEntry('stacker_current_node_max_size', 20); + +// CFG: LOCAL-FILE-DATABASE-CLASS +$cfg->setConfigEntry('local_file_database_class', 'CachedLocalFileDatabase'); + +// CFG: COMPRESSOR-CHANNEL-CLASS +$cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel'); + +// CFG: DEBUG-HTML-OUTPUT-TIMINGS +$cfg->setConfigEntry('debug_html_output_timings', 'N'); + +// CFG: DEBUG-CONSOLE-OUTPUT-TIMINGS +$cfg->setConfigEntry('debug_console_output_timings', 'Y'); + +// CFG: PROXY-HOST +$cfg->setConfigEntry('proxy_host', ''); + +// CFG: PROXY-PORT +$cfg->setConfigEntry('proxy_port', ''); + +// CFG: PROXY-USERNAME +$cfg->setConfigEntry('proxy_username', ''); + +// CFG: PROXY-PASSWORD +$cfg->setConfigEntry('proxy_password', ''); + +// CFG: PROXY-CONNECT-METHOD +$cfg->setConfigEntry('proxy_connect_method', 'Y'); + +// CFG: HOSTNAME-FILE +$cfg->setConfigEntry('hostname_file', '/etc/hostname'); + +// CFG: DATABASE-CACHE-ENABLED +$cfg->setConfigEntry('database_cache_enabled', FALSE); + +// CFG: DIRECTORY-CLASS +$cfg->setConfigEntry('directory_class', 'FrameworkDirectoryPointer'); + +// CFG: FILE-RAW-INPUT-CLASS +$cfg->setConfigEntry('file_raw_input_class', 'FrameworkRawFileInputPointer'); + +// CFG: FILE-RAW-OUTPUT-CLASS +$cfg->setConfigEntry('file_raw_output_class', 'FrameworkRawFileOutputPointer'); + +// CFG: FILE-RAW-INPUT-OUTPUT-CLASS +$cfg->setConfigEntry('file_raw_input_output_class', 'FrameworkFileInputOutputPointer'); + +// CFG: TEXT-FILE-INPUT-CLASS +$cfg->setConfigEntry('text_file_input_class', 'FrameworkTextFileInputPointer'); + +// CFG: CSV-INPUT-FILE-CLASS +$cfg->setConfigEntry('csv_input_file_class', 'CsvInputFile'); + +// CFG: FILE-ITERATOR-CLASS +$cfg->setConfigEntry('file_iterator_class', 'FileIterator'); + +// CFG: FILE-STACK-PRE-ALLOCATE-ENABLED +$cfg->setConfigEntry('file_stack_pre_allocate_enabled', 'Y'); + +// CFG: FILE-STACK-PRE-ALLOCATE-COUNT +$cfg->setConfigEntry('file_stack_pre_allocate_count', 10000); + +// CFG: INDEX-INDEX-CLASS +$cfg->setConfigEntry('file_stack_index_class', 'FileStackIndex'); + +// CFG: INDEX-PRE-ALLOCATE-ENABLED +$cfg->setConfigEntry('index_pre_allocate_enabled', 'Y'); + +// CFG: INDEX-PRE-ALLOCATE-COUNT +$cfg->setConfigEntry('index_pre_allocate_count', 10000); + +// CFG: STACK-FILE-CLASS +$cfg->setConfigEntry('stack_file_class', 'StackFile'); + +// CFG: INDEX-FILE-CLASS +$cfg->setConfigEntry('index_file_class', 'IndexFile'); + +// CFG: TASK-HANDLER-CLASS +$cfg->setConfigEntry('task_handler_class', 'TaskHandler'); + +// CFG: TASK-LIST-CLASS +$cfg->setConfigEntry('task_list_class', 'TaskList'); + +// CFG: LIST-GROUP-CLASS +$cfg->setConfigEntry('list_group_class', 'ListGroupList'); + +// CFG: DEFAULT-ITERATOR-CLASS +$cfg->setConfigEntry('default_iterator_class', 'DefaultIterator'); + +// CFG: ACTIVE-TASK-VISITOR-CLASS +$cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor'); + +// CFG: IDLE-TASK-CLASS +$cfg->setConfigEntry('idle_task_class', 'IdleLoopTask'); + +// CFG: TASK-IDLE-LOOP-STARTUP-DELAY +$cfg->setConfigEntry('task_idle_loop_startup_delay', 0); + +// CFG: TASK-IDLE-LOOP-INTERVAL-DELAY +$cfg->setConfigEntry('task_idle_loop_interval_delay', 0); + +// CFG: TASK-IDLE-LOOP-MAX-RUNS +$cfg->setConfigEntry('task_idle_loop_max_runs', 0); + +// CFG: IDLE-LOOP-TIME (5 milli seconds) +$cfg->setConfigEntry('idle_loop_time', 5); + +// CFG: SHUTDOWN-TASK-VISITOR-CLASS +$cfg->setConfigEntry('shutdown_task_visitor_class', 'ShutdownTaskVisitor'); + +// CFG: DEFAULT-IMAGE-COMMAND +$cfg->setConfigEntry('default_image_command', 'build'); + +// CFG: DEFAULT-IMAGE-CONTROLLER +$cfg->setConfigEntry('default_image_controller', 'build'); + +// CFG: MENU-TEMPLATE-CLASS +$cfg->setConfigEntry('menu_template_class', 'MenuTemplateEngine'); + +// CFG: MENU-TEMPLATE-EXTENSION +$cfg->setConfigEntry('menu_template_extension', '.xml'); + +// CFG: FEATURE-FUSE-CLASS +$cfg->setConfigEntry('feature_fuse_class', 'FuseFeature'); + +// CFG: TEMP-FILE-PATH +$cfg->setConfigEntry('temp_file_path', sys_get_temp_dir()); + +// CFG: IPC-SOCKET-FILE-NAME +$cfg->setConfigEntry('ipc_socket_file_name', 'php_ipc_socket'); + +// CFG: EXTENSION-SCRYPT-LOADED (By default scrypt is assumed absent and later tested being there) +$cfg->setConfigEntry('extension_scrypt_loaded', FALSE); + +// CFG: EXTENSION-UUID-LOADED (By default uuid is assumed absent and later tested being there) +$cfg->setConfigEntry('extension_uuid_loaded', FALSE); + +// [EOF] +?> diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php new file mode 100644 index 00000000..b89791be --- /dev/null +++ b/inc/config/class_FrameworkConfiguration.php @@ -0,0 +1,414 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class FrameworkConfiguration implements Registerable { + /** + * The framework's main configuration array which will be initialized with + * hard-coded configuration data and might be overwritten/extended by + * config data from the database. + */ + private $config = array(); + + /** + * The configuration instance itself + */ + private static $configInstance = NULL; + + // Some constants for the configuration system + const EXCEPTION_CONFIG_KEY_IS_EMPTY = 0x130; + const EXCEPTION_CONFIG_KEY_WAS_NOT_FOUND = 0x131; + const EXCEPTION_CONFIG_VALUE_TYPE_UNSUPPORTED = 0x132; + + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Empty for now + } + + /** + * Compatiblity method to return this class' name + * + * @return __CLASS__ This class' name + */ + public function __toString () { + return get_class($this); + } + + /** + * Getter for a singleton instance of this class + * + * @return $configInstance A singleton instance of this class + */ + public static final function getSelfInstance () { + // is the instance there? + if (is_null(self::$configInstance)) { + // Create a config instance + self::$configInstance = new FrameworkConfiguration(); + } // END - if + + // Return singleton instance + return self::$configInstance; + } + + /** + * Converts dashes to underscores, e.g. useable for configuration entries + * + * @param $str The string with maybe dashes inside + * @return $str The converted string with no dashed, but underscores + */ + private final function convertDashesToUnderscores ($str) { + // Convert them all + $str = str_replace('-', '_', $str); + + // Return converted string + return $str; + } + + /** + * Setter for default time zone (must be correct!) + * + * @param $zone The time-zone string (e.g. Europe/Berlin) + * @return void + */ + public final function setDefaultTimezone ($zone) { + // Is PHP version 5.1.0 or higher? Older versions are being ignored + if (version_compare(phpversion(), '5.1.0', '>=')) { + /* + * Set desired time zone to prevent date() and related functions to + * issue a E_WARNING. + */ + date_default_timezone_set($zone); + } // END - if + } + + /** + * Setter for runtime magic quotes + * + * @param $enableQuotes Whether enable magic runtime quotes (should be disabled for security reasons) + * @return void + * @todo This method encapsulates a deprecated PHP function and should be deprecated, too. + */ + public final function setMagicQuotesRuntime ($enableQuotes) { + // Is the PHP version < 5.4? + if (version_compare(phpversion(), '5.4', '>=')) { + // Then silently skip this part as set_magic_quotes_runtime() is deprecated + return; + } // END - if + + // Cast it to boolean + $enableQuotes = (boolean) $enableQuotes; + + // Set it + set_magic_quotes_runtime($enableQuotes); + } + + /** + * Checks whether the given configuration key is set + * + * @param $configKey The configuration key we shall check + * @return $isset Whether the given configuration key is set + */ + public function isConfigurationEntrySet ($configKey) { + // Is it set? + $isset = isset($this->config[$configKey]); + + // Return the result + return $isset; + } + + /** + * Read a configuration element. + * + * @param $configKey The configuration element + * @return $configValue The fetched configuration value + * @throws ConfigEntryIsEmptyException If $configKey is empty + * @throws NoConfigEntryException If a configuration element was not found + */ + public function getConfigEntry ($configKey) { + // Convert dashes to underscore + $configKey = self::convertDashesToUnderscores($configKey); + + // Is a valid configuration key provided? + if (empty($configKey)) { + // Entry is empty + throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_KEY_IS_EMPTY); + } elseif (!$this->isConfigurationEntrySet($configKey)) { + // Entry was not found! + throw new NoConfigEntryException(array(__CLASS__, $configKey), self::EXCEPTION_CONFIG_KEY_WAS_NOT_FOUND); + } + + // Return the requested value + return $this->config[$configKey]; + } + + /** + * Set a configuration key + * + * @param $configKey The configuration key we want to add/change + * @param $configValue The configuration value we want to set + * @return void + * @throws ConfigEntryIsEmptyException If $configKey is empty + * @throws ConfigValueTypeUnsupportedException If $configValue has an unsupported variable type + */ + public final function setConfigEntry ($configKey, $configValue) { + // Cast to string + $configKey = self::convertDashesToUnderscores($configKey); + + // Is a valid configuration key key provided? + if (is_null($configKey)) { + // Configuration key is null + throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); + } elseif ((empty($configKey)) || (!is_string($configKey))) { + // Entry is empty + throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_KEY_IS_EMPTY); + } elseif ((is_null($configValue)) || (is_array($configValue)) || (is_object($configValue)) || (is_resource($configValue))) { + // These cannot be set as this is not intended for configuration values, please use FrameworkArrayObject instead. + throw new ConfigValueTypeUnsupportedException(array($this, $configKey, $configValue), self::EXCEPTION_CONFIG_VALUE_TYPE_UNSUPPORTED); + } + + // Set the configuration value + //* NOISY-DEBUG: */ print(__METHOD__ . ':configEntry=' . $configKey . ',configValue[' . gettype($configValue) . ']=' . $configValue . PHP_EOL); + $this->config[$configKey] = $configValue; + + // Resort the array + ksort($this->config); + } + + /** + * Unset a configuration key, the entry must be there or else an + * exception is thrown. + * + * @param $configKey Configuration key to unset + * @return void + * @throws NoConfigEntryException If a configuration element was not found + */ + public final function unsetConfigEntry ($configKey) { + // Convert dashes to underscore + $configKey = self::convertDashesToUnderscores($configKey); + + // Is the configuration key there? + if (!$this->isConfigurationEntrySet($configKey)) { + // Entry was not found! + throw new NoConfigEntryException(array(__CLASS__, $configKey), self::EXCEPTION_CONFIG_KEY_WAS_NOT_FOUND); + } // END - if + + // Unset it + unset($this->config[$configKey]); + } + + /** + * Detects the server address (SERVER_ADDR) and set it in configuration + * + * @return $serverAddress The detected server address + * @todo We have to add some more entries from $_SERVER here + */ + public function detectServerAddress () { + // Is the entry set? + if (!$this->isConfigurationEntrySet('server_addr')) { + // Is it set in $_SERVER? + if (isset($_SERVER['SERVER_ADDR'])) { + // Set it from $_SERVER + $this->setServerAddress($_SERVER['SERVER_ADDR']); + } elseif (class_exists('ConsoleTools')) { + // Run auto-detecting through console tools lib + ConsoleTools::acquireSelfIPAddress(); + } + } // END - if + + // Now get it from configuration + $serverAddress = $this->getServerAddress(); + + // Return it + return $serverAddress; + } + + /** + * Setter for SERVER_ADDR + * + * @param $serverAddress New SERVER_ADDR value to set + * @return void + */ + public function setServerAddress ($serverAddress) { + $this->setConfigEntry('server_addr', (string) $serverAddress); + } + + /** + * Getter for SERVER_ADDR + * + * @return $serverAddress New SERVER_ADDR value to set + */ + public function getServerAddress () { + return $this->getConfigEntry('server_addr'); + } + + /** + * Detects the HTTPS flag + * + * @return $https The detected HTTPS flag or null if failed + */ + public function detectHttpSecured () { + // Default is null + $https = NULL; + + // Is HTTPS set? + if ($this->isHttpSecured()) { + // Then use it + $https = $_SERVER['HTTPS']; + } // END - if + + // Return it + return $https; + } + + /** + * Checks whether HTTPS is set in $_SERVER + * + * @return $isset Whether HTTPS is set + */ + public function isHttpSecured () { + return (isset($_SERVER['HTTPS'])); + } + + /** + * Dectect and return the base URL for all URLs and forms + * + * @return $baseUrl Detected base URL + */ + public function detectBaseUrl () { + // Initialize the URL + $baseUrl = 'http'; + + // Do we have HTTPS? + if ($this->isHttpSecured()) { + // Add the >s< for HTTPS + $baseUrl .= 's'; + } // END - if + + // Construct the full URL and secure it against CSRF attacks + $baseUrl = $baseUrl . '://' . $this->detectDomain() . $this->detectScriptPath(); + + // Return the URL + return $baseUrl; + } + + /** + * Detect safely and return the full domain where this script is installed + * + * @return $fullDomain The detected full domain + */ + public function detectDomain () { + // Full domain is localnet.invalid by default + $fullDomain = 'localnet.invalid'; + + // Is the server name there? + if (isset($_SERVER['SERVER_NAME'])) { + // Detect the full domain + $fullDomain = htmlentities(strip_tags($_SERVER['SERVER_NAME']), ENT_QUOTES); + } // END - if + + // Return it + return $fullDomain; + } + + /** + * Detect safely the script path without trailing slash which is the glue + * between "http://your-domain.invalid/" and "script-name.php" + * + * @return $scriptPath The script path extracted from $_SERVER['SCRIPT_NAME'] + */ + public function detectScriptPath () { + // Default is empty + $scriptPath = ''; + + // Is the scriptname set? + if (isset($_SERVER['SCRIPT_NAME'])) { + // Get dirname from it and replace back-slashes with slashes for lame OSes... + $scriptPath = str_replace("\\", '/', dirname($_SERVER['SCRIPT_NAME'])); + } // END - if + + // Return it + return $scriptPath; + } + + /** + * Getter for field name + * + * @param $fieldName Field name which we shall get + * @return $fieldValue Field value from the user + * @throws NullPointerException If the result instance is null + */ + public final function getField ($fieldName) { + // Our super interface "FrameworkInterface" requires this + throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); + } + + /** + * Checks if given field is set + * + * @param $fieldName Field name to check + * @return $isSet Whether the given field name is set + * @throws NullPointerException If the result instance is null + */ + public function isFieldSet ($fieldName) { + // Our super interface "FrameworkInterface" requires this + throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); + } + + /** + * Generates a code for hashes from this class + * + * @return $hashCode The hash code respresenting this class + */ + public function hashCode () { + return crc32($this->__toString()); + } + + /** + * Checks whether an object equals this object. You should overwrite this + * method to implement own equality checks + * + * @param $objectInstance An instance of a FrameworkInterface object + * @return $equals Whether both objects equals + */ + public function equals (FrameworkInterface $objectInstance) { + // Now test it + $equals = (( + $this->__toString() == $objectInstance->__toString() + ) && ( + $this->hashCode() == $objectInstance->hashCode() + )); + + // Return the result + return $equals; + } +} + +// [EOF] +?> diff --git a/inc/database.php b/inc/database.php new file mode 100644 index 00000000..ec973cb0 --- /dev/null +++ b/inc/database.php @@ -0,0 +1,55 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * @deprecated + * @todo Minimize these includes + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Initialize database layer +$databaseInstance = NULL; + +// Generate FQFN for the database layer +$fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') . '.php'; + +// Load the database layer include +if (BaseFrameworkSystem::isReadableFile($fqfn)) { + // Load the layer + require($fqfn); +} else { + // Layer is missing! + ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -> R.I.P.', + FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') + )); +} + +// Clean it up +unset($fqfn); + +// Prepare database instance +$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getSelfInstance(), $databaseInstance); + +// Is the app variable there and valid? +// @TODO Rewrite this +if (is_object($app)) $app->setDatabaseInstance($connectionInstance); + +// [EOF] +?> diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php new file mode 100644 index 00000000..86b1c380 --- /dev/null +++ b/inc/database/lib-local.php @@ -0,0 +1,29 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// For testing purposes we use a local file database +$databaseInstance = ObjectFactory::createObjectByConfiguredName('local_file_database_class'); + +// [EOF] +?> diff --git a/inc/includes.php b/inc/includes.php new file mode 100644 index 00000000..e235a9e6 --- /dev/null +++ b/inc/includes.php @@ -0,0 +1,74 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * @deprecated + * @todo Minimize these includes + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Include the class loader function +require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php'); + +/* + * Shall we include additional configs where you can configure some things? + * Then load matching config file. + */ +ClassLoader::getSelfInstance()->loadExtraConfigs(); + +// Register auto-load function with the SPL +// @TODO This makes the core depending on the SPL. But it should be installed anyway. +spl_autoload_register('ClassLoader::autoLoad'); + +// Does the user has an application specified? +// @TODO Find a nicer OOP-ed way for this +if (!empty($_GET['app'])) { + // Set the application from string + $application = (string) $_GET['app']; +} elseif (!empty($_SERVER['argv'][1])) { + // Set the application from string + $application = (string) $_SERVER['argv'][1]; + $app = explode('=', trim($application)); + if ($app[0] == 'app') { + // Application is valid! + $application = trim($app[1]); + } else { + // Invalid entry found, first must be "app"! + $application = FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_application'); + } +} else { + // Set the "application selector" application + $application = FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_application'); +} + +// Secure it, by keeping out tags +$application = htmlentities(strip_tags($application), ENT_QUOTES); + +// Secure it a little more with a reg.exp. +$application = preg_replace('/([^a-z0-9_-])+/i', '', $application); + +// Set the application name for later usage +FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application); + +// Scan for all framework classes, exceptions and interfaces +ClassLoader::scanFrameworkClasses(); + +// [EOF] +?> diff --git a/inc/main/classes/client/http/class_HttpClient.php b/inc/main/classes/client/http/class_HttpClient.php new file mode 100644 index 00000000..8d6271df --- /dev/null +++ b/inc/main/classes/client/http/class_HttpClient.php @@ -0,0 +1,164 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class HttpClient extends BaseClient implements Client { + // Constants + const HTTP_EOL = "\r\n"; + const HTTP_USER_AGENT = 'HttpClient-Core/1.0'; + + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Set default user agent string (to allow other classes to override this) + $this->setUserAgent(self::HTTP_USER_AGENT); + + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this Client class and prepares it for usage + * + * @param $socketResource Resource of a socket (optional) + * @return $clientInstance An instance of a Client class + */ + public final static function createHttpClient ($socketResouce = FALSE) { + // Get a new instance + $clientInstance = new HttpClient(); + + // Set socket resource + $clientInstance->setSocketResource($socketResource); + + // Return the prepared instance + return $clientInstance; + } + + /** + * Checks wether proxy configuration is used + * + * @return $isUsed Wether proxy is used + */ + protected function isProxyUsed () { + // Do we have cache? + if (!isset($GLOBALS[__METHOD__])) { + // Determine it + $GLOBALS[__METHOD__] = (($this->getConfigInstance()->getConfigEntry('proxy_host') != '') && ($this->getConfigInstance()->getConfigEntry('proxy_port') > 0)); + } // END - if + + // Return cache + return $GLOBALS[__METHOD__]; + } + + /** + * Sets up a proxy tunnel for given hostname and through resource + * + * @param $host Host to connect to + * @param $port Port number to connect to + * @return $response Response array + */ + protected function setupProxyTunnel ($host, $port) { + // Initialize array + $response = array('', '', ''); + + // Do the connect + $respArray = $this->doConnectRequest($host, $port); + + // Analyze first header line + if (((strtolower($respArray[0]) !== 'http/1.0') && (strtolower($respArray[0]) !== 'http/1.1')) || ($respArray[1] != '200')) { + // Response code is not 200 + return $response; + } // END - if + + // All fine! + return $respArray; + } + + /** + * Sends a raw HTTP request out to given IP/host and port number + * + * @param $method Request method (GET, POST, HEAD, CONNECT, ...) + * @param $host Host to connect to + * @param $port Port number to connect to + * @return $responseArray Array with raw response + */ + private function sendRawHttpRequest ($method, $host, $port, array $header = array()) { + // Minimum raw HTTP/1.1 request + $rawRequest = $method . ' ' . $host . ':' . $port . ' HTTP/1.1' . self::HTTP_EOL; + $rawRequest .= 'Host: ' . $host . ':' . $port . self::HTTP_EOL; + + // Use login data to proxy? (username at least) + if ($this->getConfigInstance()->getConfigEntry('proxy_username') != '') { + // Add it as well + $encodedAuth = base64_encode($this->getConfigInstance()->getConfigEntry('proxy_username') . ':' . $this->getConfigInstance()->getConfigEntry('proxy_password')); + $rawRequest .= 'Proxy-Authorization: Basic ' . $encodedAuth . self::HTTP_EOL; + } // END - if + + // Add last new-line + $rawRequest .= self::HTTP_EOL; + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('HTTP-CLIENT[' . __METHOD__ . ':' . __LINE__ . ']: rawRequest=' . $rawRequest); + + // Write request + fwrite($this->getSocketResource(), $rawRequest); + + // Got response? + if (feof($this->getSocketResource())) { + // No response received + return $response; + } // END - if + + // Read the first line + $resp = trim(fgets($this->getSocketResource(), 10240)); + + // "Explode" the string to an array + $responseArray = explode(' ', $resp); + + // And return it + return $responseArray; + } + + /** + * A HTTP/1.1 CONNECT request + * + * @param $host Host to connect to + * @param $port Port number to connect to + * @return $responseArray An array with the read response + */ + public function doConnectRequest ($host, $port) { + // Prepare extra header(s) + $headers = array( + 'Proxy-Connection' => 'Keep-Alive' + ); + + // Prepare raw request + $responseArray = $this->sendRawHttpRequest('CONNECT', $host, $port, $headers); + + // Return response array + return $responseArray; + } +} + +// [EOF] +?> diff --git a/inc/main/classes/container/socket/class_SocketContainer.php b/inc/main/classes/container/socket/class_SocketContainer.php new file mode 100644 index 00000000..2d3ab2aa --- /dev/null +++ b/inc/main/classes/container/socket/class_SocketContainer.php @@ -0,0 +1,128 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class SocketContainer extends BaseContainer implements Registerable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this Container class and prepares it for usage + * + * @param $socketResource A valid socket resource + * @param $infoInstance An instance of a ShareableInfo class + * @param $packageData Raw package data + * @return $containerInstance An instance of this Container class + */ + public static final function createSocketContainer ($socketResource, ShareableInfo $infoInstance = NULL, array $packageData = array()) { + // Get a new instance + $containerInstance = new SocketContainer(); + + // Remove unneeded entries + unset($packageData[NetworkPackage::PACKAGE_DATA_CONTENT]); + unset($packageData[NetworkPackage::PACKAGE_DATA_HASH]); + + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']:socketResource=' . $socketResource . ',packageData='.print_r($packageData, TRUE)); + + // Is the info instance set? + if ($infoInstance instanceof ShareableInfo) { + // Get listener/helper from info class + $listenerInstance = $infoInstance->getListenerInstance(); + $helperInstance = $infoInstance->getHelperInstance(); + + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: listenerInstance[]=' . gettype($listenerInstance)); + + // Is there a listener instance set? + if ($listenerInstance instanceof Listenable) { + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: Setting listenerInstance=' . $listenerInstance->__toString() . ' ...'); + + // Set it here for later usage + $containerInstance->setListenerInstance($listenerInstance); + } elseif ($helperInstance instanceof ConnectionHelper) { + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: Setting helperInstance=' . $helperInstance->__toString() . ' ...'); + + // Set it here for later usage + $containerInstance->setHelperInstance($helperInstance); + } + } // END - if + + // Set the resource ... + $containerInstance->setSocketResource($socketResource); + + // ... and package data + $containerInstance->setPackageData($packageData); + + // Return the prepared instance + return $containerInstance; + } + + /** + * Checks whether the given Universal Node Locator matches with the one from package data + * + * @param $unl A Universal Node Locator + * @return $matches Whether $address matches with the one from package data + */ + public final function ifAddressMatches ($unl) { + // Get current package data + $packageData = $this->getPackageData(); + + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: unl=' . $unl . ',packageData=' . print_r($packageData, TRUE)); + + // So, does both match? + $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unl)); + + // Return result + return $matches; + } + + /** + * Checks whether the given socket matches with stored + * + * @param $socketResource A valid socket resource + * @return $matches Whether given socket matches + */ + public final function ifSocketResourceMatches ($socketResource) { + // Debug message + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: socketResource[' . gettype($socketResource) . ']=' .$socketResource . ',storedResource[' . gettype($this->getSocketResource()) . ']=' . $this->getSocketResource()); + + // So, does both match? + $matches = ((is_resource($socketResource)) && ($socketResource === $this->getSocketResource())); + + // Return result + return $matches; + } +} + +// [EOF] +?> diff --git a/inc/main/classes/database/migration/.htaccess b/inc/main/classes/database/migration/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/main/classes/database/migration/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/main/classes/database/migration/class_ b/inc/main/classes/database/migration/class_ new file mode 100644 index 00000000..963756de --- /dev/null +++ b/inc/main/classes/database/migration/class_ @@ -0,0 +1,37 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class extends BaseDatabaseMigration implements MigrateableDatabase { + /** + * Protected constructor + * + * @return void + */ + protected function __construct($class = __CLASS__) { + // Call parent constructor + parent::__construct($class); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/database/migration/class_BaseDatabaseMigration.php b/inc/main/classes/database/migration/class_BaseDatabaseMigration.php new file mode 100644 index 00000000..753a6292 --- /dev/null +++ b/inc/main/classes/database/migration/class_BaseDatabaseMigration.php @@ -0,0 +1,37 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseDatabaseMigration extends BaseFrameworkSystem { + /** + * Protected constructor + * + * @return void + */ + protected function __construct($class = __CLASS__) { + // Call parent constructor + parent::__construct($class); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/database/migration/format_upgrade/.htaccess b/inc/main/classes/database/migration/format_upgrade/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/main/classes/database/migration/format_upgrade/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/main/classes/database/migration/format_upgrade/class_ b/inc/main/classes/database/migration/format_upgrade/class_ new file mode 100644 index 00000000..139ee0c8 --- /dev/null +++ b/inc/main/classes/database/migration/format_upgrade/class_ @@ -0,0 +1,37 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class extends BaseFormatUpgrade implements UpgradeableDatabaseFormat { + /** + * Protected constructor + * + * @return void + */ + protected function __construct($class = __CLASS__) { + // Call parent constructor + parent::__construct($class); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php b/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php new file mode 100644 index 00000000..ebeff25c --- /dev/null +++ b/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php @@ -0,0 +1,37 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseFormatUpgrade extends BaseDatabaseMigration implements MigrateableDatabase { + /** + * Protected constructor + * + * @return void + */ + protected function __construct($class = __CLASS__) { + // Call parent constructor + parent::__construct($class); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php new file mode 100644 index 00000000..4c7c4211 --- /dev/null +++ b/inc/main/classes/factories/client/class_ClientFactory.php @@ -0,0 +1,71 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ClientFactory extends ObjectFactory { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates a client object for given protocol. This method uses the + * registry pattern to cache those instances. + * + * @param $protocolInstance An instance of a HandleableProtocol class to create a client object for (e.g. 'http' for a HTTP/1.1 client) + * @param $socketResource A valid socket resource (optional) + * @return $clientInstance An instance of the requested client + */ + public static final function createClientByProtocolInstance (HandleableProtocol $protocolInstance, $socketResource = FALSE) { + // Default is NULL (to initialize variable) + $clientInstance = NULL; + + // Generate registry key + $registryKey = strtolower($protocolInstance->getProtocolName()) . '_client'; + + // Is the key already in registry? + if (Registry::getRegistry()->instanceExists($registryKey)) { + // Then use that instance + $clientInstance = Registry::getRegistry()->getInstance($registryKey); + + // Set socket resource + $clientInstance->setSocketResource($socketResource); + } else { + // Generate object instance + $clientInstance = self::createObjectByConfiguredName($registryKey, array($socketResource)); + + // Set it in registry for later re-use + Registry::getRegistry()->addInstance($registryKey, $clientInstance); + } + + // Return the prepared instance + return $clientInstance; + } +} + +// [EOF] +?> diff --git a/inc/main/classes/handler/raw_data/class_ b/inc/main/classes/handler/raw_data/class_ new file mode 100644 index 00000000..06173e62 --- /dev/null +++ b/inc/main/classes/handler/raw_data/class_ @@ -0,0 +1,73 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???NetworkPackageHandler extends BaseNetworkPackageHandler implements Networkable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set handler name + $this->setHandlerName('!!!'); + } + + /** + * Creates an instance of this class + * + * @return $handlerInstance An instance of a Networkable class + */ + public final static function create???NetworkPackageHandler () { + // Get new instance + $handlerInstance = new ???NetworkPackageHandler(); + + // Return the prepared instance + return $handlerInstance; + } + + /** + * Processes a package from given resource. This is mostly useful for TCP + * package handling and is implemented in the TcpListener class + * + * @param $resource A valid resource identifier + * @return void + * @throws InvalidResourceException If the given resource is invalid + * @todo 0% + */ + public function processResourcePackage ($resource) { + // Check the resource + if (!is_resource($resource)) { + // Throw an exception + throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE); + } // END - if + + // Implement processing here + $this->partialStub('Please implement this method.'); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php new file mode 100644 index 00000000..24f2913e --- /dev/null +++ b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php @@ -0,0 +1,197 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +abstract class BaseDataHandler extends BaseHandler { + /** + * Last exception instance from database layer or NULL (default) + */ + private $lastException = NULL; + + /** + * Array with search criteria elements + */ + protected $searchData = array(); + + /** + * Array with all data XML nodes (which hold the actual data) and their values + */ + protected $messageDataElements = array(); + + /** + * Array for translating message data elements (other node's data mostly) + * into configuration elements. + */ + protected $messageToConfig = array(); + + /** + * Array for copying configuration entries + */ + protected $configCopy = array(); + + /** + * Protected constructor + * + * @param $className Name of the class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + + // Get a DHT instance + $dhtInstance = DhtObjectFactory::createDhtInstance('node'); + + // Set it here + $this->setDhtInstance($dhtInstance); + } + + /** + * Getter for search data array + * + * @return $searchData Search data array + */ + public final function getSearchData () { + return $this->searchData; + } + + /** + * Getter for last exception + * + * @return $lastException Last thrown exception + */ + public final function getLastException () { + return $this->lastException; + } + + /** + * Setter for last exception + * + * @param $lastException Last thrown exception + * @return void + */ + public final function setLastException (FrameworkException $exceptionInstance = NULL) { + $this->lastException = $exceptionInstance; + } + + /** + * Prepares a message as answer for given message data for delivery. + * + * @param $messageData An array with all message data + * @param $packageInstance An instance of a Deliverable instance + * @return void + */ + protected function prepareAnswerMessage (array $messageData, Deliverable $packageInstance) { + // Debug message + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Going to send an answer message for ' . $this->getHandlerName() . ' ...'); + + // Get a helper instance based on this handler's name + $helperInstance = ObjectFactory::createObjectByConfiguredName('node_answer_' . $this->getHandlerName() . '_helper_class', array($messageData)); + + // Get node instance + $nodeInstance = NodeObjectFactory::createNodeInstance(); + + // Load descriptor XML + $helperInstance->loadDescriptorXml($nodeInstance); + + /* + * Set missing (temporary) configuration data, mostly it needs to be + * copied from message data array. + */ + $this->initMessageConfigurationData($messageData); + + // Compile any configuration variables + $helperInstance->getTemplateInstance()->compileConfigInVariables(); + + // Deliver the package + $helperInstance->sendPackage($nodeInstance); + + /* + * Remove temporary configuration + */ + $this->removeMessageConfigurationData($messageData); + + // Debug message + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Answer message has been prepared.'); + } + + /** + * Prepares the next message + * + * @param $messageData An array with all message data + * @param $packageInstance An instance of a Deliverable instance + * @return void + */ + protected function prepareNextMessage (array $messageData, Deliverable $packageInstance) { + // Debug message + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Going to send next message ...'); + + // Get a helper instance based on this handler's name + $helperInstance = ObjectFactory::createObjectByConfiguredName('node_next_' . $this->getHandlerName() . '_helper_class', array($messageData)); + + // Get node instance + $nodeInstance = NodeObjectFactory::createNodeInstance(); + + // Load descriptor XML + $helperInstance->loadDescriptorXml($nodeInstance); + + /* + * Set missing (temporary) configuration data, mostly it needs to be + * copied from message data array. + */ + $this->initMessageConfigurationData($messageData); + + // Compile any configuration variables + $helperInstance->getTemplateInstance()->compileConfigInVariables(); + + // Deliver the package + $helperInstance->sendPackage($nodeInstance); + + /* + * Remove temporary configuration + */ + $this->removeMessageConfigurationData($messageData); + + // Debug message + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Next message has been prepared.'); + } + + /** + * Initializes configuration data from given message data array + * + * @param $messageData An array with all message data + * @return void + */ + abstract protected function initMessageConfigurationData (array $messageData); + + /** + * Removes configuration data with given message data array from global + * configuration + * + * @param $messageData An array with all message data + * @return void + */ + abstract protected function removeMessageConfigurationData (array $messageData); +} + +// [EOF] +?> diff --git a/inc/main/classes/handler/raw_data/network/class_ b/inc/main/classes/handler/raw_data/network/class_ new file mode 100644 index 00000000..9323d99a --- /dev/null +++ b/inc/main/classes/handler/raw_data/network/class_ @@ -0,0 +1,68 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???RawDataHandler extends BaseRawDataHandler implements Networkable { + /** + * Last socket error (default: Success) + */ + private $lastSocketError = 0; + + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set handler name + $this->setHandlerName('|||'); + } + + /** + * Creates an instance of this class + * + * @return $handlerInstance An instance of a Networkable class + */ + public static final function create???RawDataHandler () { + // Get new instance + $handlerInstance = new ???RawDataHandler(); + + // Return the prepared instance + return $handlerInstance; + } + + /** + * Processes raw data from given resource. This is mostly useful for TCP + * package handling and is implemented in the ???Listener class + * + * @param $resource A valid socket resource array + * @return void + */ + public function processRawDataFromResource (array $socketArray) { + } +} + +// [EOF] +?> diff --git a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php new file mode 100644 index 00000000..012e15a5 --- /dev/null +++ b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php @@ -0,0 +1,183 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseRawDataHandler extends BaseHandler { + // Error codes: + // - Socket raw data stream errors + const SOCKET_ERROR_UNKNOWN = 'unknown_error'; // Unknown error (should not happen) + const SOCKET_ERROR_TRANSPORT_ENDPOINT = 'transport_endpoint'; // Transport endpoint has closed + const SOCKET_ERROR_INVALID_BASE64_MODULO = 'base64_modulo'; // Length is not modulo 4 + const SOCKET_ERROR_INVALID_BASE64_MESSAGE = 'base64_message'; // Raw data is not Base64-encoded + const SOCKET_ERROR_UNHANDLED = 'unhandled_package'; // Unhandled raw data (not bad) + const SOCKET_ERROR_CONNECTION_REFUSED = 'connection_refused'; // The name says it: connection refused + const SOCKET_ERROR_CONNECTION_TIMED_OUT = 'connection_timed_out'; // The name says it: connection attempt has timed-out + const SOCKET_ERROR_OPERATION_IN_PROGRESS = 'operation_in_progress'; // 'Operation now in progress' + const SOCKET_ERROR_OPERATION_ALREADY_PROGRESS = 'operation_already_progress'; // 'Operation already in progress' + const SOCKET_ERROR_RESOURCE_UNAVAILABLE = 'resource_unavailable'; // 'Resource temporary unavailable' + const SOCKET_ERROR_NO_ROUTE_TO_HOST = 'no_route_to_host'; // The name says it: no route to host + const SOCKET_ERROR_CONNECTION_RESET_BY_PEER = 'connection_reset_by_peer'; // Connection reset by peer + const SOCKET_ERROR_BROKEN_PIPE = 'broken_pipe'; // Broken pipe + const SOCKET_ERROR_PERMISSION_DENIED = 'permission_denied'; // Permission denied + const SOCKET_CONNECTED = 'connected'; // Nothing errorous happens, socket is connected + + // - Package errors + const PACKAGE_ERROR_INVALID_DATA = 'invalid_data'; // Invalid data in package found + const PACKAGE_ERROR_INCOMPLETE_DATA = 'incomplete_data'; // Incomplete data sent (e.g. field is missing) + const PACKAGE_ERROR_INVALID_CONTENT = 'invalid_content'; // Content is invalid (e.g. not well-formed) + const PACKAGE_ERROR_RECIPIENT_MISMATCH = 'recipient_error'; // Recipient is not us + const PACKAGE_LEVEL_CHECK_OKAY = 'checked_package'; // Package is fine + + // Package data + const PACKAGE_RAW_DATA = 'raw_data'; + const PACKAGE_ERROR_CODE = 'error_code'; + + // Start/end marker + const STREAM_START_MARKER = '[[S]]'; + const STREAM_END_MARKER = '[[E]]'; + + /** + * Stacker for raw data + */ + const STACKER_NAME_RAW_DATA = 'raw_data'; + + /** + * Error code from socket + */ + private $errorCode = -1; + + /** + * Protected constructor + * + * @param $className Name of the class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + + // Set error code to 'unknown' + $this->setErrorCode(self::SOCKET_ERROR_UNKNOWN); + + // Init stacker instance for processed raw data + $stackInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class'); + + // Remember this in this package handler + $this->setStackInstance($stackInstance); + + // Init stacker + $this->initStack(); + } + + /** + * Initializes the stacker for raw data + * + * @return void + */ + protected function initStack () { + $this->getStackInstance()->initStack(self::STACKER_NAME_RAW_DATA); + } + + /** + * Adds given raw data to the raw data stacker + * + * @param $rawData raw data from the socket resource + * @return void + */ + protected function addRawDataToStacker ($rawData) { + /* + * Add the deocoded data and error code to the stacker so other classes + * (e.g. NetworkPackage) can "pop" it from the stacker. + */ + $this->getStackInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array( + self::PACKAGE_RAW_DATA => $rawData, + self::PACKAGE_ERROR_CODE => $this->getErrorCode() + )); + } + + /** + * Checks whether raw data is pending for further processing. + * + * @return $isPending Whether raw data is pending + */ + public function isRawDataPending () { + // Does the stacker have some entries (not empty)? + $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA)); + + // Return it + return $isPending; + } + + /** + * "Getter" for next raw data from the stacker + * + * @return $rawData Raw data from the stacker + */ + public function getNextRawData () { + // "Pop" the raw data from the stacker + $rawData = $this->getStackInstance()->popNamed(self::STACKER_NAME_RAW_DATA); + + // And return it + return $rawData; + } + + /** + * Checks whether the 'recipient' field matches our own an universal node + * locator. + * + * @param $packageData Raw package data + * @return $matches Whether it matches + * @todo This method will be moved to a better place + */ + protected function ifRecipientMatchesOwnUniversalNodeLocator (array $packageData) { + // Construct own address first + $ownAddress = NodeObjectFactory::createNodeInstance()->determineUniversalNodeLocator(); + + // Does it match? + $matches = ($ownAddress === $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]); + + // Return result + return $matches; + } + + /** + * Setter for error code + * + * @param $errorCode The error code we shall set + * @return void + */ + public final function setErrorCode ($errorCode) { + $this->errorCode = $errorCode; + } + + /** + * Getter for error code + * + * @return $errorCode The error code + */ + public final function getErrorCode () { + return $this->errorCode; + } +} + +// [EOF] +?> diff --git a/inc/main/classes/listener/class_ b/inc/main/classes/listener/class_ new file mode 100644 index 00000000..00c6eb75 --- /dev/null +++ b/inc/main/classes/listener/class_ @@ -0,0 +1,102 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???Listener extends BaseListener implements Listenable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set the protocol to !!! + $this->setProtocolName('!!!'); + } + + /** + * Creates an instance of this class + * + * @return $listenerInstance An instance a prepared listener class + */ + public final static function create???Listener () { + // Get new instance + $listenerInstance = new ???Listener(); + + // Return the prepared instance + return $listenerInstance; + } + + /** + * Initializes the listener by setting up the required socket server + * + * @return void + * @todo 0% done + */ + public function initListener() { + $this->partialStub('Need to implement this method.'); + } + + /** + * "Listens" for incoming network packages + * + * @return void + * @todo 0% done + */ + public function doListen() { + $this->partialStub('Need to implement this method.'); + } + + /** + * Checks whether the listener would accept the given package data array + * + * @param $packageData Raw package data + * @return $accepts Whether this listener does accept + */ + public function ifListenerAcceptsPackageData (array $packageData) { + $this->partialStub('Need to implement this method.') { + } + + /** + * Monitors incoming raw data from the handler and transfers it to the + * given receiver instance. + * + * @return void + */ + public function monitorIncomingRawData () { + $this->partialStub('Need to implement this method.') { + } + + /** + * Getter for connection type + * + * @return $connectionType Connection type for this listener + */ + public function getConnectionType () { + $this->partialStub('Need to implement this method.') { + } +} + +// [EOF] +?> diff --git a/inc/main/classes/listener/class_BaseListener.php b/inc/main/classes/listener/class_BaseListener.php new file mode 100644 index 00000000..5b17e796 --- /dev/null +++ b/inc/main/classes/listener/class_BaseListener.php @@ -0,0 +1,597 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseListener extends BaseFrameworkSystem implements Visitable { + // Exception code constants + const EXCEPTION_INVALID_SOCKET = 0xa00; + const EXCEPTION_SOCKET_ALREADY_REGISTERED = 0xa01; + const EXCEPTION_SOCKET_CREATION_FAILED = 0xa02; + const EXCEPTION_NO_SOCKET_ERROR = 0xa03; + const EXCEPTION_CONNECTION_ALREADY_REGISTERED = 0xa04; + const EXCEPTION_UNEXPECTED_PACKAGE_STATUS = 0xa05; + const EXCEPTION_UNSUPPORTED_PACKAGE_CODE_HANDLER = 0xa06; + const EXCEPTION_FINAL_CHUNK_VERIFICATION = 0xa07; + const EXCEPTION_INVALID_DATA_CHECKSUM = 0xa08; + + /** + * Address (IP mostly) we shall listen on + */ + private $listenAddress = '0.0.0.0'; // This is the default and listens on all interfaces + + /** + * Port we shall listen on (or wait for incoming data) + */ + private $listenPort = 0; // This port MUST be changed by your application + + /** + * Whether we are in blocking or non-blocking mode (default: non-blocking + */ + private $blockingMode = FALSE; + + /** + * A peer pool instance + */ + private $poolInstance = NULL; + + /** + * Protected constructor + * + * @param $className Name of the class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } + + /** + * Checks whether the given socket resource is a server socket + * + * @param $socketResource A valid socket resource + * @return $isServerSocket Whether the socket resource is a server socket + */ + protected function isServerSocketResource ($socketResource) { + // Check it + $isServerSocket = ((is_resource($socketResource)) && (!@socket_getpeername($socketResource, $peerName))); + + // We need to clear the error here if it is a resource + if ($isServerSocket === TRUE) { + // Clear the error + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('socketResource[]=' . gettype($socketResource)); + socket_clear_error($socketResource); + } // END - if + + // Check peer name, it must be empty + $isServerSocket = (($isServerSocket) && (empty($peerName))); + + // Return result + return $isServerSocket; + } + + /** + * Setter for listen address + * + * @param $listenAddress The address this listener should listen on + * @return void + */ + protected final function setListenAddress ($listenAddress) { + $this->listenAddress = (string) $listenAddress; + } + + /** + * Getter for listen address + * + * @return $listenAddress The address this listener should listen on + */ + public final function getListenAddress () { + return $this->listenAddress; + } + + /** + * Setter for listen port + * + * @param $listenPort The port this listener should listen on + * @return void + */ + protected final function setListenPort ($listenPort) { + $this->listenPort = (int) $listenPort; + } + + /** + * Getter for listen port + * + * @return $listenPort The port this listener should listen on + */ + public final function getListenPort () { + return $this->listenPort; + } + + /** + * "Setter" to set listen address from configuration entry + * + * @param $configEntry The configuration entry holding our listen address + * @return void + */ + public final function setListenAddressByConfiguration ($configEntry) { + $this->setListenAddress($this->getConfigInstance()->getConfigEntry($configEntry)); + } + + /** + * "Setter" to set listen port from configuration entry + * + * @param $configEntry The configuration entry holding our listen port + * @return void + */ + public final function setListenPortByConfiguration ($configEntry) { + $this->setListenPort($this->getConfigInstance()->getConfigEntry($configEntry)); + } + + /** + * Setter for blocking-mode + * + * @param $blockingMode Whether blocking-mode is disabled (default) or enabled + * @return void + */ + protected final function setBlockingMode ($blockingMode) { + $this->blockingMode = (boolean) $blockingMode; + } + + /** + * Checks whether blocking-mode is enabled or disabled + * + * @return $blockingMode Whether blocking mode is disabled or enabled + */ + public final function isBlockingModeEnabled () { + return $this->blockingMode; + } + + /** + * Setter for peer pool instance + * + * @param $poolInstance The peer pool instance we shall set + * @return void + */ + protected final function setPoolInstance (PoolablePeer $poolInstance) { + $this->poolInstance = $poolInstance; + } + + /** + * Getter for peer pool instance + * + * @return $poolInstance The peer pool instance we shall set + */ + public final function getPoolInstance () { + return $this->poolInstance; + } + + /** + * Getter for connection type + * + * @return $connectionType Connection type for this listener + */ + public final function getConnectionType () { + // Wrap the real getter + return $this->getProtocolName(); + } + + /** + * Registeres the given socket resource for "this" listener instance. This + * will be done in a seperate class to allow package writers to use it + * again. + * + * @param $socketResource A valid server socket resource + * @return void + * @throws InvalidServerSocketException If the given resource is no server socket + * @throws SocketAlreadyRegisteredException If the given resource is already registered + */ + protected function registerServerSocketResource ($socketResource) { + // First check if it is valid + if (!$this->isServerSocketResource($socketResource)) { + // No server socket + throw new InvalidServerSocketException(array($this, $socketResource), self::EXCEPTION_INVALID_SOCKET); + } elseif ($this->isServerSocketRegistered($socketResource)) { + // Already registered + throw new SocketAlreadyRegisteredException($this, self::EXCEPTION_SOCKET_ALREADY_REGISTERED); + } + + // Get a socket registry instance (singleton) + $registryInstance = SocketRegistryFactory::createSocketRegistryInstance(); + + // Get a connection info instance + $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($this->getProtocolName(), 'listener'); + + // Will the info instance with listener data + $infoInstance->fillWithListenerInformation($this); + + // Register the socket + $registryInstance->registerSocket($infoInstance, $socketResource); + + // And set it here + $this->setSocketResource($socketResource); + } + + /** + * Checks whether given socket resource is registered in socket registry + * + * @param $socketResource A valid server socket resource + * @return $isRegistered Whether given server socket is registered + */ + protected function isServerSocketRegistered ($socketResource) { + // Get a socket registry instance (singleton) + $registryInstance = SocketRegistryFactory::createSocketRegistryInstance(); + + // Get a connection info instance + $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($this->getProtocolName(), 'listener'); + + // Will the info instance with listener data + $infoInstance->fillWithListenerInformation($this); + + // Check it + $isRegistered = $registryInstance->isSocketRegistered($infoInstance, $socketResource); + + // Return result + return $isRegistered; + } + + /** + * Accepts the visitor to process the visit "request" + * + * @param $visitorInstance An instance of a Visitor class + * @return void + */ + public function accept (Visitor $visitorInstance) { + // Debug message + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited ' . $this->__toString() . ' - CALLED!'); + + // Visit this listener + $visitorInstance->visitListener($this); + + // Visit the pool if set + if ($this->getPoolInstance() instanceof Poolable) { + $this->getPoolInstance()->accept($visitorInstance); + } // END - if + + // Debug message + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited ' . $this->__toString() . ' - EXIT!'); + } + + /** + * Monitors incoming raw data from the handler and transfers it to the + * given receiver instance. This method should not be called, please call + * the decorator's version instead to separator node/client traffic. + * + * @return void + * @throws UnsupportedOperatorException If this method is called by a mistake + */ + public function monitorIncomingRawData () { + throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); + } + + /** + * Constructs a callable method name from given socket error code. If the + * method is not found, a generic one is used. + * + * @param $errorCode Error code from socket_last_error() + * @return $handlerName Call-back method name for the error handler + * @throws UnsupportedSocketErrorHandlerException If the error handler is not implemented + */ + protected function getSocketErrorHandlerFromCode ($errorCode) { + // Create a name from translated error code + $handlerName = 'socketError' . self::convertToClassName($this->translateSocketErrorCodeToName($errorCode)) . 'Handler'; + + // Is the call-back method there? + if (!method_exists($this, $handlerName)) { + // Please implement this + throw new UnsupportedSocketErrorHandlerException(array($this, $handlerName, $errorCode), BaseConnectionHelper::EXCEPTION_UNSUPPORTED_ERROR_HANDLER); + } // END - if + + // Return it + return $handlerName; + } + + /** + * Translates socket error codes into our own internal names which can be + * used for call-backs. + * + * @param $errorCode The error code from socket_last_error() to be translated + * @return $errorName The translated name (all lower-case, with underlines) + */ + public function translateSocketErrorCodeToName ($errorCode) { + // Nothing bad happened by default + $errorName = BaseRawDataHandler::SOCKET_CONNECTED; + + // Is the code a number, then we have to change it + switch ($errorCode) { + case 0: // Silently ignored, the socket is connected + break; + + case 11: // "Resource temporary unavailable" + $errorName = BaseRawDataHandler::SOCKET_ERROR_RESOURCE_UNAVAILABLE; + break; + + case 13: // "Permission denied" + $errorName = BaseRawDataHandler::SOCKET_ERROR_PERMISSION_DENIED; + break; + + case 32: // "Broken pipe" + $errorName = BaseRawDataHandler::SOCKET_ERROR_BROKEN_PIPE; + break; + + case 104: // "Connection reset by peer" + $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_RESET_BY_PEER; + break; + + case 107: // "Transport end-point not connected" + case 134: // On some (?) systems for 'transport end-point not connected' + // @TODO On some systems it is 134, on some 107? + $errorName = BaseRawDataHandler::SOCKET_ERROR_TRANSPORT_ENDPOINT; + break; + + case 110: // "Connection timed out" + $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_TIMED_OUT; + break; + + case 111: // "Connection refused" + $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_REFUSED; + break; + + case 113: // "No route to host" + $errorName = BaseRawDataHandler::SOCKET_ERROR_NO_ROUTE_TO_HOST; + break; + + case 114: // "Operation already in progress" + $errorName = BaseRawDataHandler::SOCKET_ERROR_OPERATION_ALREADY_PROGRESS; + break; + + case 115: // "Operation now in progress" + $errorName = BaseRawDataHandler::SOCKET_ERROR_OPERATION_IN_PROGRESS; + break; + + default: // Everything else <> 0 + // Unhandled error code detected, so first debug it because we may want to handle it like the others + self::createDebugInstance(__CLASS__)->debugOutput('BASE-HUB[' . __METHOD__ . ':' . __LINE__ . '] UNKNOWN ERROR CODE = ' . $errorCode . ', MESSAGE = ' . socket_strerror($errorCode)); + + // Change it only in this class + $errorName = BaseRawDataHandler::SOCKET_ERROR_UNKNOWN; + break; + } + + // Return translated name + return $errorName; + } + + /** + * Shuts down a given socket resource. This method does only ease calling + * the right visitor. + * + * @param $socketResource A valid socket resource + * @return void + */ + public function shutdownSocket ($socketResource) { + // Debug message + self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM: Shutting down socket resource ' . $socketResource . ' with state ' . $this->getPrintableState() . ' ...'); + + // Set socket resource + $this->setSocketResource($socketResource); + + // Get a visitor instance + $visitorInstance = ObjectFactory::createObjectByConfiguredName('shutdown_socket_visitor_class'); + + // Debug output + self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM:' . $this->__toString() . ': visitorInstance=' . $visitorInstance->__toString()); + + // Call the visitor + $this->accept($visitorInstance); + } + + /** + * Half-shuts down a given socket resource. This method does only ease calling + * an other visitor than shutdownSocket() does. + * + * @param $socketResource A valid socket resource + * @return void + */ + public function halfShutdownSocket ($socketResource) { + // Debug message + self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM: Half-shutting down socket resource ' . $socketResource . ' with state ' . $this->getPrintableState() . ' ...'); + + // Set socket resource + $this->setSocketResource($socketResource); + + // Get a visitor instance + $visitorInstance = ObjectFactory::createObjectByConfiguredName('half_shutdown_socket_visitor_class'); + + // Debug output + self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM:' . $this->__toString() . ': visitorInstance=' . $visitorInstance->__toString()); + + // Call the visitor + $this->accept($visitorInstance); + } + + // ************************************************************************ + // Socket error handler call-back methods + // ************************************************************************ + + /** + * Handles socket error 'permission denied', but does not clear it for + * later debugging purposes. + * + * @param $socketResource A valid socket resource + * @param $socketData A valid socket data array (0 = IP/file name, 1 = port) + * @return void + * @throws SocketBindingException The socket could not be bind to + */ + protected function socketErrorPermissionDeniedHandler ($socketResource, array $socketData) { + // Get socket error code for verification + $socketError = socket_last_error($socketResource); + + // Get error message + $errorMessage = socket_strerror($socketError); + + // Shutdown this socket + $this->shutdownSocket($socketResource); + + // Throw it again + throw new SocketBindingException(array($this, $socketData, $socketResource, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET); + } + + /** + * "Listens" for incoming network packages + * + * @param $peerSuffix Suffix for peer name (e.g. :0 for TCP(/UDP?) connections) + * @return void + * @throws InvalidSocketException If an invalid socket resource has been found + */ + protected function doListenSocketSelect ($peerSuffix) { + // Check on all instances + assert($this->getPoolInstance() instanceof Poolable); + assert(is_resource($this->getSocketResource())); + + // Get all readers + $readers = $this->getPoolInstance()->getAllSingleSockets(); + $writers = array(); + $excepts = array(); + + // Check if we have some peers left + $left = socket_select( + $readers, + $writers, + $excepts, + 0, + 150 + ); + + // Some new peers found? + if ($left < 1) { + // Debug message + //* EXTREME-NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: left=' . $left . ',serverSocket=' . $this->getSocketResource() . ',readers=' . print_r($readers, TRUE)); + + // Nothing new found + return; + } // END - if + + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: serverSocket=' . $this->getSocketResource() . ',readers=' . print_r($readers, TRUE)); + + // Do we have changed peers? + if (in_array($this->getSocketResource(), $readers)) { + /* + * Then accept it, if this socket is set to non-blocking IO and the + * connection is NOT sending any data, socket_read() may throw + * error 11 (Resource temporary unavailable). This really nasty + * because if you have blocking IO socket_read() will wait and wait + * and wait ... + */ + $newSocket = socket_accept($this->getSocketResource()); + + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: newSocket=' . $newSocket . ',serverSocket=' .$this->getSocketResource()); + + // Array for timeout settings + $options = array( + // Seconds + 'sec' => $this->getConfigInstance()->getConfigEntry('tcp_socket_accept_wait_sec'), + // Milliseconds + 'usec' => $this->getConfigInstance()->getConfigEntry('tcp_socket_accept_wait_usec') + ); + + // Set timeout to configured seconds + // @TODO Does this work on Windozer boxes??? + if (!socket_set_option($newSocket, SOL_SOCKET, SO_RCVTIMEO, $options)) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0')); + } // END - if + + // Output result (only for debugging!) + /* + $option = socket_get_option($newSocket, SOL_SOCKET, SO_RCVTIMEO); + self::createDebugInstance(__CLASS__)->debugOutput('SO_RCVTIMEO[' . gettype($option) . ']=' . print_r($option, TRUE)); + */ + + // Enable SO_OOBINLINE + if (!socket_set_option($newSocket, SOL_SOCKET, SO_OOBINLINE ,1)) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0')); + } // END - if + + // Set non-blocking + if (!socket_set_nonblock($newSocket)) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0')); + } // END - if + + // Add it to the peers + $this->getPoolInstance()->addPeer($newSocket, BaseConnectionHelper::CONNECTION_TYPE_INCOMING); + + // Get peer name + if (!socket_getpeername($newSocket, $peerName)) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0')); + } // END - if + + // Get node instance + $nodeInstance = NodeObjectFactory::createNodeInstance(); + + // Create a faked package data array + $packageData = array( + NetworkPackage::PACKAGE_DATA_SENDER => $peerName . $peerSuffix, + NetworkPackage::PACKAGE_DATA_RECIPIENT => $nodeInstance->getSessionId(), + NetworkPackage::PACKAGE_DATA_STATUS => NetworkPackage::PACKAGE_STATUS_FAKED + ); + + // Get a connection info instance + $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($this->getProtocolName(), 'listener'); + + // Will the info instance with listener data + $infoInstance->fillWithListenerInformation($this); + + // Get a socket registry + $registryInstance = SocketRegistryFactory::createSocketRegistryInstance(); + + // Register the socket with the registry and with the faked array + $registryInstance->registerSocket($infoInstance, $newSocket, $packageData); + } // END - if + + // Do we have to rewind? + if (!$this->getIteratorInstance()->valid()) { + // Rewind the list + $this->getIteratorInstance()->rewind(); + } // END - if + + // Get the current value + $currentSocket = $this->getIteratorInstance()->current(); + + // Handle it here, if not main server socket + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: currentSocket=' . $currentSocket[BasePool::SOCKET_ARRAY_RESOURCE] . ',type=' . $currentSocket[BasePool::SOCKET_ARRAY_CONN_TYPE] . ',serverSocket=' . $this->getSocketResource()); + if (($currentSocket[BasePool::SOCKET_ARRAY_CONN_TYPE] != BaseConnectionHelper::CONNECTION_TYPE_SERVER) && ($currentSocket[BasePool::SOCKET_ARRAY_RESOURCE] != $this->getSocketResource())) { + // ... or else it will raise warnings like 'Transport endpoint is not connected' + $this->getHandlerInstance()->processRawDataFromResource($currentSocket); + } // END - if + + // Advance to next entry. This should be the last line. + $this->getIteratorInstance()->next(); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/listener/class_BaseListenerDecorator.php b/inc/main/classes/listener/class_BaseListenerDecorator.php new file mode 100644 index 00000000..ae66a5c7 --- /dev/null +++ b/inc/main/classes/listener/class_BaseListenerDecorator.php @@ -0,0 +1,153 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseListenerDecorator extends BaseDecorator implements Visitable { + /** + * Listener type + */ + private $listenerType = 'invalid'; + + /** + * Protected constructor + * + * @param $className Name of the class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } + + /** + * Getter for listen address + * + * @return $listenAddress The address this listener should listen on + */ + public final function getListenAddress () { + return $this->getListenerInstance()->getListenAddress(); + } + + /** + * Getter for listen port + * + * @return $listenPort The port this listener should listen on + */ + public final function getListenPort () { + return $this->getListenerInstance()->getListenPort(); + } + + /** + * Getter for connection type + * + * @return $connectionType Connection type for this listener + */ + public final function getConnectionType () { + return $this->getListenerInstance()->getConnectionType(); + } + + /** + * Accepts the visitor to process the visit "request" + * + * @param $visitorInstance An instance of a Visitor class + * @return void + */ + public function accept (Visitor $visitorInstance) { + // Visit this decorator + $visitorInstance->visitDecorator($this); + + // Visit the covered class + $visitorInstance->visitListener($this->getListenerInstance()); + } + + /** + * Getter for listener type. + * + * @return $listenerType The listener's type (hub/peer) + */ + public final function getListenerType () { + return $this->listenerType; + } + + /** + * Setter for listener type. + * + * @param $listenerType The listener's type (hub/peer) + * @return void + */ + protected final function setListenerType ($listenerType) { + $this->listenerType = $listenerType; + } + + /** + * Getter for peer pool instance + * + * @return $poolInstance A peer pool instance + */ + public final function getPoolInstance () { + return $this->getListenerInstance()->getPoolInstance(); + } + + /** + * Monitors incoming raw data from the handler and transfers it to the + * given receiver instance. + * + * @return void + */ + public function monitorIncomingRawData () { + // Get the handler instance + $handlerInstance = $this->getListenerInstance()->getHandlerInstance(); + + /* + * Does the deocorated listener (or even a decorator again) have a + * handler assigned? Remember that a handler will hold all incoming raw + * data and not a listener. + */ + if (!$handlerInstance instanceof Networkable) { + // Skip this silently for now. Later on, this will become mandatory! + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('No handler assigned to this listener decorator. this=' . $this->__toString() . ', listenerInstance=' . $this->getListenerInstance()->__toString()); + return; + } // END - if + + // Does the handler have some decoded data pending? + if (!$handlerInstance->isRawDataPending()) { + // No data is pending so skip further code silently + return; + } // END - if + + // Get receiver (network package) instance + $receiverInstance = NetworkPackageFactory::createNetworkPackageInstance(); + + /* + * There is some decoded data waiting. The receiver instance is an + * abstract network package (which can be received and sent out) so + * handle the decoded data over. At this moment it is not needed to + * know if the decoded data origins from a TCP or UDP connection so it + * can just be passed over to the network package receiver. + */ + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-LISTENER-DECORATOR[' . __METHOD__ . ':' . __LINE__ . '] Going to handle over some raw data to receiver instance (' . $receiverInstance->__toString() . ') ...'); + $receiverInstance->addRawDataToIncomingStack($handlerInstance); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/listener/socket/class_SocketFileListener.php b/inc/main/classes/listener/socket/class_SocketFileListener.php new file mode 100644 index 00000000..65b94039 --- /dev/null +++ b/inc/main/classes/listener/socket/class_SocketFileListener.php @@ -0,0 +1,219 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class SocketFileListener extends BaseListener implements Listenable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set the protocol to file + $this->setProtocolName('file'); + } + + /** + * Creates an instance of this class + * + * @return $listenerInstance An instance a prepared listener class + */ + public final static function createSocketFileListener () { + // Get new instance + $listenerInstance = new SocketFileListener(); + + // Return the prepared instance + return $listenerInstance; + } + + /** + * Initializes the listener by setting up the required socket server + * + * @return void + */ + public function initListener() { + // Init socket + $mainSocket = socket_create(AF_UNIX, SOCK_STREAM, 0); + + // Is the socket resource valid? + if (!is_resource($mainSocket)) { + // Something bad happened + throw new InvalidSocketException(array($this, $mainSocket), BaseListener::EXCEPTION_INVALID_SOCKET); + } // END - if + + // Get socket error code for verification + $socketError = socket_last_error($mainSocket); + + // Check if there was an error else + if ($socketError > 0) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array('null', '0')); + } // END - if + + // Create file name + $socketFile = self::createTempPathForFile($this->getConfigInstance()->getConfigEntry('ipc_socket_file_name')); + + // Debug message + self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: socketFile=' . $socketFile . ' ...'); + + // File name must not be empty + assert(!empty($socketFile)); + + // Is the file there? + if ((self::isReachableFilePath($socketFile)) && (file_exists($socketFile))) { + // Old socket found + self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: WARNING: Old socket at ' . $socketFile . ' found. Will not start.'); + + // Shutdown this socket + $this->shutdownSocket($mainSocket); + + // Quit here + exit; + } // END - if + + // Debug message + self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Binding to ' . $socketFile . ' ...'); + + // Try to bind to it + if (!socket_bind($mainSocket, $socketFile)) { + // Handle error here + $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array($socketFile, '0')); + /* + // Get socket error code for verification + $socketError = socket_last_error($mainSocket); + + // Get error message + $errorMessage = socket_strerror($socketError); + + // Shutdown this socket + $this->shutdownSocket($mainSocket); + + // And throw again + throw new InvalidSocketException(array($this, $mainSocket, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET); + */ + } // END - if + + // Start listen for connections + self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Listening for connections.'); + if (!socket_listen($mainSocket)) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array($socketFile, '0')); + /* + // Get socket error code for verification + $socketError = socket_last_error($mainSocket); + + // Get error message + $errorMessage = socket_strerror($socketError); + + // Shutdown this socket + $this->shutdownSocket($mainSocket); + + // And throw again + throw new InvalidSocketException(array($this, $mainSocket, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET); + */ + } // END - if + + // Now, we want non-blocking mode + self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Setting non-blocking mode.'); + if (!socket_set_nonblock($mainSocket)) { + // Handle this socket error with a faked recipientData array + $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array($socketFile, '0')); + /* + // Get socket error code for verification + $socketError = socket_last_error($mainSocket); + + // Get error message + $errorMessage = socket_strerror($socketError); + + // Shutdown this socket + $this->shutdownSocket($mainSocket); + + // And throw again + throw new InvalidSocketException(array($this, $mainSocket, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET); + */ + } // END - if + + // Set the main socket + $this->registerServerSocketResource($mainSocket); + + // Initialize the peer pool instance + $poolInstance = ObjectFactory::createObjectByConfiguredName('application_pool_class', array($this)); + + // Add main socket + $poolInstance->addPeer($mainSocket, BaseConnectionHelper::CONNECTION_TYPE_SERVER); + + // And add it to this listener + $this->setPoolInstance($poolInstance); + + // Initialize iterator for listening on packages + $iteratorInstance = ObjectFactory::createObjectByConfiguredName('socket_listen_iterator_class', array($poolInstance->getPoolEntriesInstance())); + + // Rewind it and remember it in this class + $iteratorInstance->rewind(); + $this->setIteratorInstance($iteratorInstance); + + // Initialize the raw data handler + $handlerInstance = ObjectFactory::createObjectByConfiguredName('socket_raw_data_handler_class'); + + // Set it in this class + $this->setHandlerInstance($handlerInstance); + + // Output message + self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Socket listener now ready on socket ' . $socketFile . ' for service.'); + } + + /** + * "Listens" for incoming network packages + * + * @return void + */ + public function doListen() { + // Call super method + $this->doListenSocketSelect(''); + } + + /** + * Checks whether the listener would accept the given package data array + * + * @param $packageData Raw package data + * @return $accepts Whether this listener does accept + */ + public function ifListenerAcceptsPackageData (array $packageData) { + $this->partialStub('Need to implement this method.'); + } + + /** + * Monitors incoming raw data from the handler and transfers it to the + * given receiver instance. + * + * @return void + */ + public function monitorIncomingRawData () { + $this->partialStub('Need to implement this method.'); + } +} + +// [EOF] +?> diff --git a/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php new file mode 100644 index 00000000..e03980b6 --- /dev/null +++ b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php @@ -0,0 +1,97 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class SocketFileListenerDecorator extends BaseListenerDecorator implements Listenable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set listener type and protocol name + $this->setListenerType('hub'); + $this->setProtocolName('tcp'); + } + + /** + * Creates an instance of this class + * + * @param $listenerInstance A Listener instance + * @return $decoratorInstance An instance a prepared listener decorator class + */ + public static final function createSocketFileListenerDecorator (Listenable $listenerInstance) { + // Get new instance + $decoratorInstance = new SocketFileListenerDecorator(); + + // Set the application instance + $decoratorInstance->setListenerInstance($listenerInstance); + + // Return the prepared instance + return $decoratorInstance; + } + + /** + * Initializes the listener by setting up the required socket server + * + * @return void + */ + public function initListener () { + $this->partialStub('WARNING: This method should not be called.'); + } + + /** + * "Listens" for incoming network packages + * + * @return void + */ + public function doListen () { + // Handle generic TCP package + $this->getListenerInstance()->doListen(); + + // Handle hub TCP package + $this->partialStub('Need to handle hub TCP package.'); + } + + /** + * Checks whether the listener would accept the given package data array + * + * @param $packageData Raw package data + * @return $accepts Whether this listener does accept + */ + public function ifListenerAcceptsPackageData (array $packageData) { + // Get a tags instance + $tagsInstance = PackageTagsFactory::createPackageTagsInstance(); + + // So is the package accepted with this listener? + $accepts = $tagsInstance->ifPackageDataIsAcceptedByListener($packageData, $this); + + // Return the result + return $accepts; + } +} + +// [EOF] +?> diff --git a/inc/main/classes/resolver/class_ b/inc/main/classes/resolver/class_ new file mode 100644 index 00000000..0813fe57 --- /dev/null +++ b/inc/main/classes/resolver/class_ @@ -0,0 +1,577 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???Resolver extends BaseResolver implements Resolver { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set prefix to '???' + $this->setClassPrefix('???'); + } + + /** + * Creates an instance of a Html action resolver with a given default action + * + * @param $!!!Name The default action we shall execute + * @param $appInstance An instance of a manageable application helper class + * @return $resolverInstance The prepared action resolver instance + * @throws EmptyVariableException Thrown if default action is not set + * @throws Invalid|||Exception Thrown if default action is invalid + */ + public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) { + // Create the new instance + $resolverInstance = new ???Resolver(); + + // Is the variable $!!!Name set and the action is valid? + if (empty($!!!Name)) { + // Then thrown an exception here + throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); + } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) { + // Invalid action found + throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } + + // Set the application instance + $resolverInstance->setApplicationInstance($appInstance); + + // Return the prepared instance + return $resolverInstance; + } + + /** + * Returns an action instance for a given request class or null if + * it was not found + * + * @param $requestInstance An instance of a request class + * @return $!!!Instance An instance of the resolved action + * @throws Invalid|||Exception Thrown if $!!!Name is + * invalid + * @throws Invalid|||InstanceException Thrown if $!!!Instance + * is an invalid instance + */ + public function resolve|||ByRequest (Requestable $requestInstance) { + // Init variables + $!!!Name = ''; + $!!!Instance = null; + + // This goes fine so let's resolve the action + $!!!Name = $requestInstance->getRequestElement('action'); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // And validate it + if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) { + // This action has an invalid instance! + throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Set last action + $this->setResolvedInstance($!!!Instance); + + // Return the resolved action instance + return $!!!Instance; + } + + /** + * Resolves the action by its direct name and returns an instance of its class + * + * @return $!!!Instance An instance of the action class + * @throws Invalid|||Exception Thrown if $!!!Name is invalid + */ + public function resolve||| () { + // Initiate the instance variable + $!!!Instance = null; + + // Get action name + $!!!Name = $this->get|||Name(); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) { + $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + } // END - if + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // Return the instance + return $!!!Instance; + } +} + +// [EOF] +?> + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???Resolver extends BaseResolver implements Resolver { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set prefix to '???' + $this->setClassPrefix('???'); + } + + /** + * Creates an instance of a Html action resolver with a given default action + * + * @param $!!!Name The default action we shall execute + * @param $appInstance An instance of a manageable application helper class + * @return $resolverInstance The prepared action resolver instance + * @throws EmptyVariableException Thrown if default action is not set + * @throws Invalid|||Exception Thrown if default action is invalid + */ + public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) { + // Create the new instance + $resolverInstance = new ???Resolver(); + + // Is the variable $!!!Name set and the action is valid? + if (empty($!!!Name)) { + // Then thrown an exception here + throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); + } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) { + // Invalid action found + throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } + + // Set the application instance + $resolverInstance->setApplicationInstance($appInstance); + + // Return the prepared instance + return $resolverInstance; + } + + /** + * Returns an action instance for a given request class or null if + * it was not found + * + * @param $requestInstance An instance of a request class + * @return $!!!Instance An instance of the resolved action + * @throws Invalid|||Exception Thrown if $!!!Name is + * invalid + * @throws Invalid|||InstanceException Thrown if $!!!Instance + * is an invalid instance + */ + public function resolve|||ByRequest (Requestable $requestInstance) { + // Init variables + $!!!Name = ''; + $!!!Instance = null; + + // This goes fine so let's resolve the action + $!!!Name = $requestInstance->getRequestElement('action'); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // And validate it + if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) { + // This action has an invalid instance! + throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Set last action + $this->setResolvedInstance($!!!Instance); + + // Return the resolved action instance + return $!!!Instance; + } + + /** + * Resolves the action by its direct name and returns an instance of its class + * + * @return $!!!Instance An instance of the action class + * @throws Invalid|||Exception Thrown if $!!!Name is invalid + */ + public function resolve||| () { + // Initiate the instance variable + $!!!Instance = null; + + // Get action name + $!!!Name = $this->get|||Name(); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) { + $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + } // END - if + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // Return the instance + return $!!!Instance; + } +} + +// [EOF] +?> + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???Resolver extends BaseResolver implements Resolver { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set prefix to '???' + $this->setClassPrefix('???'); + } + + /** + * Creates an instance of a Html action resolver with a given default action + * + * @param $!!!Name The default action we shall execute + * @param $appInstance An instance of a manageable application helper class + * @return $resolverInstance The prepared action resolver instance + * @throws EmptyVariableException Thrown if default action is not set + * @throws Invalid|||Exception Thrown if default action is invalid + */ + public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) { + // Create the new instance + $resolverInstance = new ???Resolver(); + + // Is the variable $!!!Name set and the action is valid? + if (empty($!!!Name)) { + // Then thrown an exception here + throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); + } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) { + // Invalid action found + throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } + + // Set the application instance + $resolverInstance->setApplicationInstance($appInstance); + + // Return the prepared instance + return $resolverInstance; + } + + /** + * Returns an action instance for a given request class or null if + * it was not found + * + * @param $requestInstance An instance of a request class + * @return $!!!Instance An instance of the resolved action + * @throws Invalid|||Exception Thrown if $!!!Name is + * invalid + * @throws Invalid|||InstanceException Thrown if $!!!Instance + * is an invalid instance + */ + public function resolve|||ByRequest (Requestable $requestInstance) { + // Init variables + $!!!Name = ''; + $!!!Instance = null; + + // This goes fine so let's resolve the action + $!!!Name = $requestInstance->getRequestElement('action'); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // And validate it + if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) { + // This action has an invalid instance! + throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Set last action + $this->setResolvedInstance($!!!Instance); + + // Return the resolved action instance + return $!!!Instance; + } + + /** + * Resolves the action by its direct name and returns an instance of its class + * + * @return $!!!Instance An instance of the action class + * @throws Invalid|||Exception Thrown if $!!!Name is invalid + */ + public function resolve||| () { + // Initiate the instance variable + $!!!Instance = null; + + // Get action name + $!!!Name = $this->get|||Name(); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) { + $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + } // END - if + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // Return the instance + return $!!!Instance; + } +} + +// [EOF] +?> + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ???Resolver extends BaseResolver implements Resolver { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set prefix to '???' + $this->setClassPrefix('???'); + } + + /** + * Creates an instance of a ??? resolver with a given default action + * + * @param $!!!Name The default action we shall execute + * @param $appInstance An instance of a manageable application helper class + * @return $resolverInstance The prepared action resolver instance + * @throws EmptyVariableException Thrown if default action is not set + * @throws Invalid|||Exception Thrown if default action is invalid + */ + public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) { + // Create the new instance + $resolverInstance = new ???Resolver(); + + // Is the variable $!!!Name set and the action is valid? + if (empty($!!!Name)) { + // Then thrown an exception here + throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); + } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) { + // Invalid action found + throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } + + // Set the application instance + $resolverInstance->setApplicationInstance($appInstance); + + // Return the prepared instance + return $resolverInstance; + } + + /** + * Returns an action instance for a given request class or null if + * it was not found + * + * @param $requestInstance An instance of a request class + * @return $!!!Instance An instance of the resolved action + * @throws Invalid|||Exception Thrown if $!!!Name is + * invalid + * @throws Invalid|||InstanceException Thrown if $!!!Instance + * is an invalid instance + */ + public function resolve|||ByRequest (Requestable $requestInstance) { + // Init variables + $!!!Name = ''; + $!!!Instance = null; + + // This goes fine so let's resolve the action + $!!!Name = $requestInstance->getRequestElement('action'); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // And validate it + if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) { + // This action has an invalid instance! + throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Set last action + $this->setResolvedInstance($!!!Instance); + + // Return the resolved action instance + return $!!!Instance; + } + + /** + * Resolves the action by its direct name and returns an instance of its class + * + * @return $!!!Instance An instance of the action class + * @throws Invalid|||Exception Thrown if $!!!Name is invalid + */ + public function resolve||| () { + // Initiate the instance variable + $!!!Instance = null; + + // Get action name + $!!!Name = $this->get|||Name(); + + // Is the action empty? Then fall back to default action + if (empty($!!!Name)) { + $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action'); + } // END - if + + // Check if action is valid + if ($this->is|||Valid($!!!Name) === FALSE) { + // This action is invalid! + throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION); + } // END - if + + // Get the action + $!!!Instance = $this->load|||(); + + // Return the instance + return $!!!Instance; + } +} + +// [EOF] +?> diff --git a/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php new file mode 100644 index 00000000..891f32fd --- /dev/null +++ b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php @@ -0,0 +1,104 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ActiveTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisitor, ListenerVisitor, DecoratorVisitor { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set visitor mode + $this->setVisitorMode('task'); + } + + /** + * Creates an instance of this class + * + * @return $visitorInstance An instance a Visitorable class + */ + public static final function createActiveTaskVisitor () { + // Get new instance + $visitorInstance = new ActiveTaskVisitor(); + + // Return the prepared instance + return $visitorInstance; + } + + /** + * Visits the given task instance + * + * @param $taskInstance A Taskable instance + * @return void + */ + public function visitTask (Taskable $taskInstance) { + // Execute the task from this visitor + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting task ' . $taskInstance->__toString() . ' - CALLED!'); + $taskInstance->executeTask(); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting task ' . $taskInstance->__toString() . ' - EXIT!'); + } + + /** + * Pool visitor method for active tasks + * + * @param $poolInstance A Poolable instance + * @return void + */ + public function visitPool (Poolable $poolInstance) { + /** + * We don't need to visit a pool as an active task because a pool can + * never become a task. Instead e.g. by a listener pool we should visit + * all listeners one by one + */ + } + + /** + * Visits the given listener instance + * + * @param $listenerInstance A Listenable instance + * @return void + */ + public function visitListener (Listenable $listenerInstance) { + // Do "listen" here + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting ' . $listenerInstance->__toString() . ' - CALLED!'); + $listenerInstance->doListen(); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting ' . $listenerInstance->__toString() . ' - FINISH'); + } + + /** + * Visits the given decorator instance + * + * @param $decoratorInstance A decorator instance + * @return void + */ + public function visitDecorator (BaseDecorator $decoratorInstance) { + // A decorator itself can never become an active task so this method + // remains empty. + } +} + +// [EOF] +?> diff --git a/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php new file mode 100644 index 00000000..7bfbc5bd --- /dev/null +++ b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php @@ -0,0 +1,97 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ShutdownTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisitor, ListenerVisitor, DecoratorVisitor { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + + // Set visitor mode + $this->setVisitorMode('task'); + } + + /** + * Creates an instance of this class + * + * @return $visitorInstance An instance a Visitorable class + */ + public static final function createShutdownTaskVisitor () { + // Get new instance + $visitorInstance = new ShutdownTaskVisitor(); + + // Return the prepared instance + return $visitorInstance; + } + + /** + * Visits the given task instance + * + * @param $taskInstance A Taskable instance + * @return void + */ + public function visitTask (Taskable $taskInstance) { + // Shutdown the task instance + $taskInstance->doShutdown(); + } + + /** + * Pool visitor method for active tasks + * + * @param $poolInstance A Poolable instance + * @return void + */ + public function visitPool (Poolable $poolInstance) { + // Shutdown the pool instance + $poolInstance->doShutdown(); + } + + /** + * Visits the given listener instance + * + * @param $listenerInstance A Listenable instance + * @return void + */ + public function visitListener (Listenable $listenerInstance) { + // Shutdown the listener instance + $listenerInstance->doShutdown(); + } + + /** + * Visits the given decorator instance + * + * @param $decoratorInstance A decorator instance + * @return void + */ + public function visitDecorator (BaseDecorator $decoratorInstance) { + // Shutdown the decorator instance + $decoratorInstance->doShutdown(); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php new file mode 100644 index 00000000..bbddc178 --- /dev/null +++ b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php @@ -0,0 +1,45 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class ConfigEntryIsEmptyException extends FrameworkException { + /** + * The constructor + * + * @param $class Class throwing this exception + * @param $code Code number for the exception + * @return void + */ + public function __construct (FrameworkConfiguration $class, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] Empty configuration entry provided.', + $class->__toString(), + $this->getLine() + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php new file mode 100644 index 00000000..af89d421 --- /dev/null +++ b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php @@ -0,0 +1,45 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class SavePathIsEmptyException extends DatabaseException { + /** + * The constructor + * + * @param $class Class throwing this exception + * @param $code Code number for the exception + * @return void + */ + public function __construct (FrameworkInterface $class, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] Save path is empty.', + $class->__toString(), + $this->getLine() + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/file_directory/class_FileIsEmptyException.php b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php new file mode 100644 index 00000000..6703a102 --- /dev/null +++ b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php @@ -0,0 +1,39 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class FileIsEmptyException extends FrameworkException { + /** + * The constructor + * + * @param $fqfn Ignored + * @param $code Code number for the exception + * @return void + */ + public function __construct ($fqfn, $code) { + // Call parent constructor + parent::__construct('No file name provided.', $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/file_directory/class_PathIsEmptyException.php b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php new file mode 100644 index 00000000..54838d6c --- /dev/null +++ b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php @@ -0,0 +1,45 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class PathIsEmptyException extends FrameworkException { + /** + * The constructor + * + * @param $class Class throwing this exception + * @param $code Code number for the exception + * @return void + */ + public function __construct (FrameworkInterface $class, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] Directory path is empty.', + $class->__toString(), + $this->getLine() + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php new file mode 100644 index 00000000..87aac8c9 --- /dev/null +++ b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php @@ -0,0 +1,45 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class LanguagePathIsEmptyException extends FrameworkException { + /** + * The constructor + * + * @param $class Class throwing this exception + * @param $code Code number for the exception + * @return void + */ + public function __construct (FrameworkInterface $class, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] Language base path is empty.', + $class->__toString(), + $this->getLine() + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/main/class_InvalidCommandInstanceException.php b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php new file mode 100644 index 00000000..f35021a0 --- /dev/null +++ b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php @@ -0,0 +1,46 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class InvalidCommandInstanceException extends FrameworkException { + /** + * The constructor + * + * @param $message Message from the exception + * @param $code Code number for the exception + * @return void + */ + public function __construct (array $msgArray, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] Invalid command %s detected.', + $msgArray[0]->__toString(), + $this->getLine(), + $msgArray[1] + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/main/class_MissingMethodException.php b/inc/main/exceptions/main/class_MissingMethodException.php new file mode 100644 index 00000000..b06ae95a --- /dev/null +++ b/inc/main/exceptions/main/class_MissingMethodException.php @@ -0,0 +1,51 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * @todo Try to rewrite user/guest login classes and mark this exception as deprecated + * @deprecated Please do no longer use this exception + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class MissingMethodException extends FrameworkException { + /** + * The constructor + * + * @param $classArray Array holding the exception data + * @param $code Code number for the exception + * @return void + */ + public function __construct (array $classArray, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] This class has no method %s().', + $classArray[0]->__toString(), + $this->getLine(), + $classArray[1] + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/socket/class_NoSocketRegisteredException.php b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php new file mode 100644 index 00000000..fd9207ba --- /dev/null +++ b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php @@ -0,0 +1,44 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class NoSocketRegisteredException extends AbstractSocketException { + /** + * A Constructor for this exception + * + * @param $protocolInstance An instance of a HandleableProtocol class + * @param $code Error code + * @return void + */ + public function __construct (HandleableProtocol $protocolInstance, $code) { + // Construct the message + $message = sprintf('[%s:] Requested socket is not yet registered.', + $protocolInstance->__toString() + ); + + // Call parent exception constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/socket/class_SocketShutdownException.php b/inc/main/exceptions/socket/class_SocketShutdownException.php new file mode 100644 index 00000000..9cdb27b2 --- /dev/null +++ b/inc/main/exceptions/socket/class_SocketShutdownException.php @@ -0,0 +1,51 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class SocketShutdownException extends AbstractSocketException { + /** + * A Constructor for this exception + * + * @param $helperInstance An instance of a ConnectionHelper class + * @param $code Error code + * @return void + */ + public function __construct (ConnectionHelper $helperInstance, $code) { + // Get socket resource + $socketResource = $helperInstance->getSocketResource(); + + // Construct the message + $message = sprintf('[%s:] Socket %s cannot be shutdown down. errNo=%s, errStr=%s', + $helperInstance->__toString(), + $socketResource, + socket_last_error($socketResource), + socket_strerror(socket_last_error($socketResource)) + ); + + // Call parent exception constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/template/class_BasePathIsEmptyException.php b/inc/main/exceptions/template/class_BasePathIsEmptyException.php new file mode 100644 index 00000000..3aa87789 --- /dev/null +++ b/inc/main/exceptions/template/class_BasePathIsEmptyException.php @@ -0,0 +1,45 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BasePathIsEmptyException extends FrameworkException { + /** + * The constructor + * + * @param $class Class throwing this exception + * @param $code Code number for the exception + * @return void + */ + public function __construct (FrameworkInterface $class, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] Template path is empty.', + $class->__toString(), + $this->getLine() + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/exceptions/template/class_InvalidBasePathStringException.php b/inc/main/exceptions/template/class_InvalidBasePathStringException.php new file mode 100644 index 00000000..ec97d1de --- /dev/null +++ b/inc/main/exceptions/template/class_InvalidBasePathStringException.php @@ -0,0 +1,46 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class InvalidBasePathStringException extends FrameworkException { + /** + * The constructor + * + * @param $classArray Array holding exception data + * @param $code Code number for the exception + * @return void + */ + public function __construct (array $classArray, $code) { + // Add a message around the missing class + $message = sprintf('[%s:%d] %s is not a string with a base path.', + $classArray[0]->__toString(), + $this->getLine(), + $classArray[1] + ); + + // Call parent constructor + parent::__construct($message, $code); + } +} + +// [EOF] +?> diff --git a/inc/main/interfaces/database/migration/.htaccess b/inc/main/interfaces/database/migration/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/main/interfaces/database/migration/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/main/interfaces/database/migration/class_MigrateableDatabase.php b/inc/main/interfaces/database/migration/class_MigrateableDatabase.php new file mode 100644 index 00000000..4a84d17c --- /dev/null +++ b/inc/main/interfaces/database/migration/class_MigrateableDatabase.php @@ -0,0 +1,28 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface MigrateableDatabase extends FrameworkDatabase { +} + +// [EOF] +?> diff --git a/inc/main/interfaces/database/migration/format_upgrade/.htaccess b/inc/main/interfaces/database/migration/format_upgrade/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/main/interfaces/database/migration/format_upgrade/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php b/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php new file mode 100644 index 00000000..574bc040 --- /dev/null +++ b/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php @@ -0,0 +1,28 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface UpgradeableDatabaseFormat extends MigrateableDatabase { +} + +// [EOF] +?> diff --git a/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php new file mode 100644 index 00000000..d35b62d0 --- /dev/null +++ b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php @@ -0,0 +1,58 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface HandleableProtocol extends Handleable { + /** + * Getter for port number to satify HandleableProtocol + * + * @return $port The port number + */ + function getPort (); + + /** + * Getter for protocol name + * + * @return $protocol Name of used protocol + */ + function getProtocolName (); + + /** + * Validates given 'recipient' if it is a valid UNL. This means that the UNL + * can be parsed by the protocol handler. + * + * @param $packageData Valid raw package data + * @return $isValid Whether the UNL can be validated + */ + function isValidUniversalNodeLocatorByPackageData (array $packageData); + + /** + * If the found UNL (address) matches own external or internal address + * + * @param $unl UNL to test + * @return $ifMatches Whether the found UNL matches own addresss + */ + function isOwnAddress ($unl); +} + +// [EOF] +?> diff --git a/inc/main/interfaces/listener/class_Listenable.php b/inc/main/interfaces/listener/class_Listenable.php new file mode 100644 index 00000000..def265bb --- /dev/null +++ b/inc/main/interfaces/listener/class_Listenable.php @@ -0,0 +1,85 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface Listenable extends FrameworkInterface { + /** + * Initializes the listener by setting up the required socket server + * + * @return void + */ + function initListener(); + + /** + * "Listens" for incoming network packages + * + * @return void + */ + function doListen(); + + /** + * Checks whether the listener would accept the given package data array + * + * @param $packageData Raw package data + * @return $accepts Whether this listener does accept + */ + function ifListenerAcceptsPackageData (array $packageData); + + /** + * Monitors incoming raw data from the handler and transfers it to the + * given receiver instance. + * + * @return void + */ + function monitorIncomingRawData (); + + /** + * Getter for listen address + * + * @return $listenAddress The address this listener should listen on + */ + function getListenAddress (); + + /** + * Getter for listen port + * + * @return $listenPort The port this listener should listen on + */ + function getListenPort (); + + /** + * Getter for connection type + * + * @return $connectionType Connection type for this listener + */ + function getConnectionType (); + + /** + * Getter for peer pool instance + * + * @return $poolInstance The peer pool instance we shall set + */ + function getPoolInstance (); +} + +// [EOF] +?> diff --git a/inc/main/interfaces/registry/socket/class_RegisterableSocket.php b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php new file mode 100644 index 00000000..fc90e4e7 --- /dev/null +++ b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php @@ -0,0 +1,64 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface RegisterableSocket extends Registerable { + /** + * Checks whether given socket resource is registered. If $socketResource is + * FALSE only the instance will be checked. + * + * @param $infoInstance An instance of a ShareableInfo class + * @param $socketResource A valid socket resource + * @return $isRegistered Whether the given socket resource is registered + */ + function isSocketRegistered (ShareableInfo $infoInstance, $socketResource); + + /** + * Registeres given socket for listener or throws an exception if it is already registered + * + * @param $infoInstance An instance of a ShareableInfo class + * @param $socketResource A valid socket resource + * @return void + * @throws SocketAlreadyRegisteredException If the given socket is already registered + */ + function registerSocket (ShareableInfo $infoInstance, $socketResource); + + /** + * Getter for given listener's socket resource + * + * @param $listenerInstance An instance of a Listenable class + * @return $socketResource A valid socket resource + * @throws NoSocketRegisteredException If the requested socket is not registered + */ + function getRegisteredSocketResource (Listenable $listenerInstance); + + /** + * "Getter" for info instance from given package data + * + * @param $packageData Raw package data + * @return $infoInstance An instance of a ShareableInfo class + */ + function getInfoInstanceFromPackageData (array $packageData); +} + +// [EOF] +?> diff --git a/inc/main/interfaces/resolver/state/class_StateResolver.php b/inc/main/interfaces/resolver/state/class_StateResolver.php new file mode 100644 index 00000000..dee63b83 --- /dev/null +++ b/inc/main/interfaces/resolver/state/class_StateResolver.php @@ -0,0 +1,46 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface StateResolver extends Resolver { + /** + * Returns an state instance for a given package raw data and socket resource + * + * @param $helperInstance An instance of a ConnectionHelper class + * @param $packageData Raw package data + * @param $socketResource A valid socket resource + * @return $stateInstance An instance of the resolved state + */ + static function resolveStateByPackage (ConnectionHelper $helperInstance, array $packageData, $socketResource); + + /** + * Checks whether the given state is valid + * + * @param $stateName The default state we shall execute + * @return $isValid Whether the given state is valid + * @throws EmptyVariableException Thrown if given state is not set + */ + function isStateValid ($stateName); +} + +// [EOF] +?> diff --git a/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php new file mode 100644 index 00000000..36a15419 --- /dev/null +++ b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php @@ -0,0 +1,35 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface ListenerVisitor extends Visitor { + /** + * Visits the given listener instance + * + * @param $listenerInstance A Listenable instance + * @return void + */ + function visitListener (Listenable $listenerInstance); +} + +// [EOF] +?> diff --git a/inc/main/interfaces/visitor/pool/class_PoolVisitor.php b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php new file mode 100644 index 00000000..bc746ac9 --- /dev/null +++ b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php @@ -0,0 +1,35 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +interface PoolVisitor extends Visitor { + /** + * Visits the given pool instance + * + * @param $poolInstance A Poolable instance + * @return void + */ + function visitPool (Poolable $poolInstance); +} + +// [EOF] +?> diff --git a/inc/selector.php b/inc/selector.php new file mode 100644 index 00000000..3c402b40 --- /dev/null +++ b/inc/selector.php @@ -0,0 +1,83 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * @deprecated + * @todo Minimize these includes + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Try to load these includes in the given order +$configAppIncludes = array( + 'class_' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class + 'debug', // Some debugging stuff + 'exceptions', // The application's own exception handler + 'loader', // The application's class loader + 'config', // The application's own configuration + 'config-local', // Local configuration file (optional) + 'data', // Application data + 'init', // The application initializer + 'starter', // The application starter (calls entryPoint(), etc.) +); + +// Cache base path/file here +$basePathFile = FrameworkConfiguration::getSelfInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name'); + +// Is the directory there? +if (!is_dir($basePathFile)) { + // Not found. + trigger_error('Application ' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name') . ' not found.'); + exit; +} // END - if + +// Load them all (try only) +foreach ($configAppIncludes as $appInc) { + // Skip starter in test mode + if (($appInc == 'starter') && (defined('TEST'))) { + // Skip it here + continue; + } // END - if + + // Generate a FQFN for the helper class + $appFqFn = $basePathFile . '/' . $appInc . '.php'; + + // Does the include file exists? + if (BaseFrameworkSystem::isReadableFile($appFqFn)) { + // Load it + //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - START\n"; + require($appFqFn); + //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - END\n"; + } elseif (FrameworkConfiguration::getSelfInstance()->getConfigEntry('verbose_level') > 0) { + // File is missing + trigger_error(sprintf('Cannot load application script %s.php! File is missing or read-protected.', + $appInc + )); + exit; + } +} + +// Remove variables from namespace, which we don't need +unset($appInc); +unset($configAppIncludes); +unset($appFqFn); +unset($basePathFile); + +// [EOF] +?>