luyadev · nadar · Jun 1, 2021 · Jul 15, 2020 · Jul 15, 2020 · Jul 16, 2020
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -45,7 +45,7 @@ jobs:
  - name: Setup database
  run: |
  sudo /etc/init.d/mysql start
- mysql -h 127.0.0.1 --port 8888 -u root -proot myapp_test < tests/data/sql/3.0.0.sql 
+ mysql -h 127.0.0.1 --port 8888 -u root -proot myapp_test < tests/data/sql/4.0.0.sql
 
  ## run unit tests
  - name: PHP Unit tests for PHP 7.0, 7.2, 7.3, 7.4, 8.0

diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@
 /luya
 node_modules/
 composer.lock
-.phpunit.result.cache
+.phpunit.result.cache
+/tests/_output/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE
 
 ## 4.0.0
 
+* [#274](https://github.com/luyadev/luya-module-cms/pull/274) Multiple website support
 * [#341](https://github.com/luyadev/luya-module-cms/pull/341) All deprecated methods has been removed `Url::toMenuItem`, `Block::objectId`, `NavItemPage::getBlock`.
 + [#320](https://github.com/luyadev/luya-module-cms/pull/320) Replace cms menu item `publish_from` and `publish_till` with sheduler.
 + [#329](https://github.com/luyadev/luya-module-cms/issues/329) Ensure its not possible to drag a placeholder block into itself (this can create circular references)

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
  "issues":"https://github.com/luyadev/luya-module-cms/issues"
  },
  "require-dev":{
- "luyadev/luya-testsuite":"^2.0",
+ "luyadev/luya-testsuite":"^2.0 || dev-master",
  "twbs/bootstrap":"^4.3.0",
  "unglue/client":"^1.3"
  },
@@ -57,6 +57,10 @@
  {
  "type":"composer",
  "url":"https://asset-packagist.org"
+ },
+ {
+ "type":"git",
+ "url":"https://github.com/boehsermoe/luya-testsuite.git"
  }
  ]
 }
diff --git a/log/testdox.html b/log/testdox.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ </body>
+</html>
diff --git a/src/Menu.php b/src/Menu.php
@@ -2,6 +2,8 @@
 
 namespace luya\cms;
 
+use luya\cms\models\Website;
+use luya\helpers\StringHelper;
 use Yii;
 use yii\base\Component;
 use yii\web\NotFoundHttpException;
@@ -85,6 +87,7 @@
  * @property array $currentUrlRule Get the url rules for the current menu item.
  * @property \luya\cms\menu\Item $current Get the current active menu item.
  * @property \luya\cms\menu\Item $home Get the home menu item.
+ * @property \luya\web\Composition $composition Get the composition.
  *
  * @author Basil Suter <basil@nadar.io>
  * @since 1.0.0
@@ -319,7 +322,7 @@ public function setLanguageContainer($langShortCode, array $data)
  public function getLanguageContainer($langShortCode)
  {
  if (!array_key_exists($langShortCode, $this->_languageContainer)) {
- $this->_languageContainer[$langShortCode] = $this->loadLanguageContainer($langShortCode);
+ $this->_languageContainer[$langShortCode] = $this->loadWebsiteLanguageContainer($langShortCode);
  $this->trigger(self::EVENT_AFTER_LOAD);
  }
 
@@ -350,7 +353,7 @@ public function getLanguages()
 
  return $this->_languages;
  }
-
+ 
  /**
  * Get an array containing all redirect items from the database table cms_nav_item_redirect.
  *
@@ -603,16 +606,17 @@ public function getModulesMap()
  * load all navigation items for a specific language id.
  *
  * @param integer $langId
+ * @param integer $websiteId
  * @return array
  */
- private function getNavData($langId)
+ private function getNavData($langId, $websiteId)
  {
  return (new DbQuery())
  ->from(['cms_nav_item item'])
  ->select(['item.id', 'item.nav_id', 'item.title', 'item.description', 'item.keywords', 'item.image_id', 'item.is_url_strict_parsing_disabled', 'item.alias', 'item.title_tag', 'item.timestamp_create', 'item.timestamp_update', 'item.create_user_id', 'item.update_user_id', 'nav.is_home', 'nav.parent_nav_id', 'nav.sort_index', 'nav.is_hidden', 'item.nav_item_type', 'item.nav_item_type_id', 'nav_container.alias AS container'])
  ->leftJoin('cms_nav nav', 'nav.id=item.nav_id')
  ->leftJoin('cms_nav_container nav_container', 'nav_container.id=nav.nav_container_id')
- ->where(['nav.is_deleted' => false, 'item.lang_id' => $langId, 'nav.is_offline' => false, 'nav.is_draft' => false])
+ ->where(['nav.is_deleted' => false, 'nav_container.website_id' => $websiteId, 'item.lang_id' => $langId, 'nav.is_offline' => false, 'nav.is_draft' => false])
  ->orderBy(['container' => 'ASC', 'parent_nav_id' => 'ASC', 'nav.sort_index' => 'ASC'])
  ->indexBy('id')
  ->all();
@@ -688,26 +692,30 @@ private function aliasMatch(array $urlParts, $strictParsing = false)
  }
 
  /**
- * Helper method to load all contaienr data for a specific langauge.
+ * Helper method to load all container data for a specific website and language.
  *
  * @param string $langShortCode e.g. de
  * @return array
  * @throws NotFoundHttpException
+ *
+ * @since 4.0.0
  */
- private function loadLanguageContainer($langShortCode)
+ private function loadWebsiteLanguageContainer($langShortCode)
  {
- $cacheKey = $this->_cachePrefix.$langShortCode;
+ $hostName = $this->request->hostName;
+ $cacheKey = $this->_cachePrefix.$hostName.$langShortCode;
 
  $languageContainer = $this->getHasCache($cacheKey);
 
  if ($languageContainer === false) {
  $lang = $this->getLanguage($langShortCode);
-
  if (!$lang) {
  throw new NotFoundHttpException(sprintf("The requested language '%s' does not exist in language table", $langShortCode));
  }
-
- $data = $this->getNavData($lang['id']);
+
+ $website = Yii::$app->website->findOneByHostName($hostName);
+
+ $data = $this->getNavData($lang['id'], $website['id']);
 
  $index = $this->buildIndexForContainer($data);
 
@@ -724,6 +732,7 @@ private function loadLanguageContainer($langShortCode)
  $languageContainer[$key] = [
  'id' => $item['id'],
  'nav_id' => $item['nav_id'],
+ 'website_id' => $website['id'],
  'lang' => $lang['short_code'],
  'link' => $this->buildItemLink($alias, $langShortCode),
  'title' => $this->encodeValue($item['title']),
@@ -751,7 +760,7 @@ private function loadLanguageContainer($langShortCode)
 
  $this->setHasCache($cacheKey, $languageContainer);
  }
- 
+
  return $languageContainer;
  }
 

diff --git a/src/Website.php b/src/Website.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace luya\cms;
+
+use Yii;
+use luya\helpers\StringHelper;
+use luya\traits\CacheableTrait;
+use luya\web\Composition;
+use yii\base\Component;
+use \luya\cms\models\Website as WebsiteModel;
+use yii\web\NotFoundHttpException;
+
+/**
+ * Class Website
+ *
+ * @property array $current = ['name']
+ *
+ * @author Bennet Klarhoelter <boehsermoe@me.com>
+ * @since 4.0.0
+ */
+class Website extends Component
+{
+ use CacheableTrait;
+
+ private $_current = null;
+
+ /**
+ * @return array|bool
+ * @throws NotFoundHttpException
+ */
+ public function getCurrent()
+ {
+ if ($this->_current === null) {
+ $this->_current = $this->findOneByHostName(Yii::$app->request->hostName);
+ }
+
+ return $this->_current;
+ }
+
+ /**
+ * Get website information by hostname.
+ *
+ * @param string $hostName
+ * @return array|boolean If the website exists an array with informations as returned, otherwise false.
+ */
+ public function findOneByHostName($hostName)
+ {
+ $cache = $this->getHasCache($hostName);
+ if ($cache) {
+ return $cache;
+ }
+ $defaultWebsite = false;
+
+ $websites = $this->loadAllWebsiteData();
+ if (isset($websites[$hostName])) {
+ $this->setHasCache($hostName, $websites[$hostName]);
+ return $websites[$hostName];
+ }
+
+ foreach ($websites as $website) {
+ foreach ($website['aliases'] as $alias) {
+ if (StringHelper::matchWildcard($alias, $hostName)) {
+ $this->setHasCache($hostName, $website);
+ return $website;
+ }
+ }
+
+ if ($website['is_default']) {
+ $defaultWebsite = $website;
+ }
+ }
+
+ if (!$defaultWebsite) {
+ // should never happen because there is always a default website
+ throw new NotFoundHttpException(sprintf("The requested host '%s' does not exist in website table", $hostName));
+ }
+
+ $this->setHasCache($hostName, $defaultWebsite);
+ return $defaultWebsite;
+ }
+
+ private $_allWebsiteData = null;
+
+ /**
+ * @return array
+ */
+ private function loadAllWebsiteData()
+ {
+ if ($this->_allWebsiteData === null) {
+ $this->_allWebsiteData = WebsiteModel::find()->andWhere(['is_active' => true])->cache()->indexBy('host')->asArray()->all();
+ foreach ($this->_allWebsiteData as &$website) {
+ $aliases = array_map('trim', explode(',', $website['aliases']));
+ $website['aliases'] = array_filter($aliases);
+ }
+ }
+ return $this->_allWebsiteData;
+ }
+
+ /**
+ * Create a host mapping with default languages for {\luya\web\Composition::$hostInfoMapping}
+ * @return array
+ */
+ public function createHostInfoMapping()
+ {
+ $hostInfoMapping = [];
+
+ foreach ($this->loadAllWebsiteData() as $website) {
+ if ($website['default_lang']) {
+ $hostInfoMapping[$website['host']] = [Composition::VAR_LANG_SHORT_CODE => $website['default_lang']];
+ foreach ($website['aliases'] as $alias) {
+ if (!isset($hostInfoMapping[$alias])) {
+ $hostInfoMapping[$alias] = [Composition::VAR_LANG_SHORT_CODE => $website['default_lang']];
+ }
+ }
+ }
+ }
+
+ return $hostInfoMapping;
+ }
+}
diff --git a/src/admin/Module.php b/src/admin/Module.php
@@ -57,6 +57,7 @@ final class Module extends \luya\admin\base\Module implements CoreModuleInterfac
  'api-cms-redirect' => 'luya\cms\admin\apis\RedirectController',
  'api-cms-theme' => 'luya\cms\admin\apis\ThemeController',
  'api-cms-log' => 'luya\cms\admin\apis\LogController',
+ 'api-cms-website' => 'luya\cms\admin\apis\WebsiteController',
  ];
 
  public $apiRules = [
@@ -265,6 +266,7 @@ public function getMenu()
  ->node('menu_node_cmssettings', 'settings')
 
  ->group('menu_group_page_display')
+ ->itemApi('menu_group_item_env_websites', 'cmsadmin/website/index', 'http', 'api-cms-website')
  ->itemApi('menu_group_item_env_layouts', 'cmsadmin/layout/index', 'view_quilt', 'api-cms-layout')
  ->itemApi('menu_group_item_env_themes', 'cmsadmin/theme/index', 'color_lens', 'api-cms-theme')
  ->itemApi('menu_group_item_env_container', 'cmsadmin/navcontainer/index', 'label_outline', 'api-cms-navcontainer')

diff --git a/src/admin/apis/MenuController.php b/src/admin/apis/MenuController.php
@@ -35,6 +35,7 @@ public function actionDataMenu()
  'items' => ArrayHelper::typeCast(MenuHelper::getItems()),
  'drafts' => ArrayHelper::typeCast(MenuHelper::getDrafts()),
  'containers' => ArrayHelper::typeCast(MenuHelper::getContainers()),
+ 'websites' => ArrayHelper::typeCast(MenuHelper::getWebsites()),
  'hiddenCats' => ArrayHelper::typeCast(Yii::$app->adminuser->identity->setting->get("togglecat", [])),
  ];
  }

diff --git a/src/admin/apis/NavController.php b/src/admin/apis/NavController.php
@@ -3,11 +3,13 @@
 namespace luya\cms\admin\apis;
 
 use luya\admin\models\TagRelation;
+use luya\cms\models\NavContainer;
 use luya\cms\models\NavItemRedirect;
 use Yii;
 use luya\cms\models\Property;
 use luya\cms\models\Nav;
 use luya\cms\models\NavItem;
+use yii\db\Query;
 use yii\helpers\Json;
 use yii\base\InvalidCallException;
 use luya\admin\models\UserOnline;
@@ -229,10 +231,18 @@ public function actionToggleHidden($navId, $hiddenStatus)
 
  public function actionToggleHome($navId, $homeState)
  {
- $item = Nav::find()->where(['id' => $navId])->one();
+ /** @var Nav $item */
+ $item = Nav::find()->with('navContainer')->where(['id' => $navId])->one();
  $this->menuFlush();
  if ($homeState == 1) {
- Nav::updateAll(['is_home' => false]);
+ $navIds = (new Query())
+ ->from(Nav::tableName())
+ ->leftJoin(NavContainer::tableName(), 'cms_nav_container.id = nav_container_id')
+ ->where(['website_id' => $item->navContainer->website_id])
+ ->select('cms_nav.id')
+ ->column();
+ Nav::updateAll(['is_home' => false], ['id' => $navIds]);
+
  $item->setAttributes([
  'is_home' => true,
  ]);
@@ -361,7 +371,7 @@ public function actionCreatePage()
  $this->menuFlush();
  $model = new Nav();
  $fromDraft = $this->postArg('use_draft');
- $parentNavId = $this->postArg('parent_nav_id');
+ $parentNavId = $this->postArg('parent_nav_id') ?: null;
  $navContainerId = $this->postArg('nav_container_id');
 
  if (!empty($parentNavId)) {

diff --git a/src/admin/apis/WebsiteController.php b/src/admin/apis/WebsiteController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace luya\cms\admin\apis;
+
+/**
+ * Theme for LUYA CMS.
+ *
+ * This module / component allow user to manage websites.
+ *
+ * @author Bennet Klarhoelter <boehsermoe@me.com>
+ * @since 4.0.0
+ */
+class WebsiteController extends \luya\admin\ngrest\base\Api
+{
+ public $modelClass = 'luya\cms\models\Website';
+}
diff --git a/src/admin/controllers/WebsiteController.php b/src/admin/controllers/WebsiteController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace luya\cms\admin\controllers;
+
+use luya\admin\ngrest\base\Controller;
+
+/**
+ * Website Container Controller.
+ *
+ * @author Bennet Klarhölter <boehsermoe@me.com>
+ * @since 4.0.0
+ */
+class WebsiteController extends Controller
+{
+ public $modelClass = 'luya\cms\models\Website';
+}