From d55d373921ca67a78608734b794ad75c4e5697a5 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 26 May 2016 19:45:54 +0200 Subject: [PATCH] Removed sitemap function/overlay --- CHANGELOG.md | 2 + XSD/sitemap.xsd | 47 -------- com.woltlab.wcf/package.xml | 1 - com.woltlab.wcf/packageInstallationPlugin.xml | 1 - com.woltlab.wcf/sitemap.xml | 8 -- .../templates/headIncludeJavaScript.tpl | 1 - com.woltlab.wcf/templates/pageNavbarTop.tpl | 1 - com.woltlab.wcf/templates/sitemap.tpl | 23 ---- .../templates/sitemapUserAccount.tpl | 23 ---- .../files/js/WoltLab/WCF/BootstrapFrontend.js | 6 +- .../js/WoltLab/WCF/Controller/Sitemap.js | 93 --------------- .../files/lib/data/sitemap/Sitemap.class.php | 79 ------------- .../lib/data/sitemap/SitemapAction.class.php | 63 ----------- .../lib/data/sitemap/SitemapEditor.class.php | 23 ---- .../lib/data/sitemap/SitemapList.class.php | 20 ---- .../builder/SitemapCacheBuilder.class.php | 26 ----- ...SitemapPackageInstallationPlugin.class.php | 80 ------------- .../system/sitemap/ISitemapProvider.class.php | 21 ---- .../system/sitemap/SitemapHandler.class.php | 106 ------------------ .../UserAccountSitemapProvider.class.php | 22 ---- wcfsetup/install/files/style/ui/sitemap.scss | 34 ------ wcfsetup/install/lang/de.xml | 2 - wcfsetup/install/lang/en.xml | 2 - wcfsetup/setup/db/install.sql | 14 --- 24 files changed, 4 insertions(+), 694 deletions(-) delete mode 100644 XSD/sitemap.xsd delete mode 100644 com.woltlab.wcf/sitemap.xml delete mode 100644 com.woltlab.wcf/templates/sitemap.tpl delete mode 100644 com.woltlab.wcf/templates/sitemapUserAccount.tpl delete mode 100644 wcfsetup/install/files/js/WoltLab/WCF/Controller/Sitemap.js delete mode 100644 wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php delete mode 100644 wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php delete mode 100644 wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php delete mode 100644 wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php delete mode 100644 wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php delete mode 100644 wcfsetup/install/files/lib/system/package/plugin/SitemapPackageInstallationPlugin.class.php delete mode 100644 wcfsetup/install/files/lib/system/sitemap/ISitemapProvider.class.php delete mode 100644 wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php delete mode 100644 wcfsetup/install/files/lib/system/sitemap/UserAccountSitemapProvider.class.php delete mode 100644 wcfsetup/install/files/style/ui/sitemap.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index 76e45d787d..5228706422 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ * Added global disable switch for languages. * Overhauled page tracking in sessions / user online locations * Overhauled language import form +* Removed sitemap function/overlay #### CMS @@ -148,6 +149,7 @@ * Option `message_sidebar_enable_avatar` removed. * Removed obsolete `$activeMenuItem` in frontend forms/pages * Obsolete interface `wcf\page\ITrackablePage` deprecated. +* PIP `wcf\system\package\plugin\SitemapPackageInstallationPlugin` removed. #### Documentation diff --git a/XSD/sitemap.xsd b/XSD/sitemap.xsd deleted file mode 100644 index 388e6d6fe2..0000000000 --- a/XSD/sitemap.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index d8b9290b33..d29cd45773 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -32,7 +32,6 @@ - diff --git a/com.woltlab.wcf/packageInstallationPlugin.xml b/com.woltlab.wcf/packageInstallationPlugin.xml index 4fbb90a766..b7df653f1d 100644 --- a/com.woltlab.wcf/packageInstallationPlugin.xml +++ b/com.woltlab.wcf/packageInstallationPlugin.xml @@ -20,7 +20,6 @@ wcf\system\package\plugin\TemplatePackageInstallationPlugin wcf\system\package\plugin\UserGroupOptionPackageInstallationPlugin wcf\system\package\plugin\UserOptionPackageInstallationPlugin - wcf\system\package\plugin\SitemapPackageInstallationPlugin wcf\system\package\plugin\ACPSearchProviderPackageInstallationPlugin wcf\system\package\plugin\StylePackageInstallationPlugin wcf\system\package\plugin\BBCodePackageInstallationPlugin diff --git a/com.woltlab.wcf/sitemap.xml b/com.woltlab.wcf/sitemap.xml deleted file mode 100644 index a5009134cf..0000000000 --- a/com.woltlab.wcf/sitemap.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl index 01ec621c93..d116a23805 100644 --- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl +++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl @@ -86,7 +86,6 @@ requirejs.config({ 'wcf.global.success.edit': '{lang}wcf.global.success.edit{/lang}', 'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}', 'wcf.page.pagePosition': '{lang __literal=true}wcf.page.pagePosition{/lang}', - 'wcf.page.sitemap': '{lang}wcf.page.sitemap{/lang}', 'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}', 'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}', 'wcf.user.panel.markAllAsRead': '{lang}wcf.user.panel.markAllAsRead{/lang}', diff --git a/com.woltlab.wcf/templates/pageNavbarTop.tpl b/com.woltlab.wcf/templates/pageNavbarTop.tpl index 7f9668f223..ae94d1501e 100644 --- a/com.woltlab.wcf/templates/pageNavbarTop.tpl +++ b/com.woltlab.wcf/templates/pageNavbarTop.tpl @@ -3,7 +3,6 @@ {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} diff --git a/com.woltlab.wcf/templates/sitemap.tpl b/com.woltlab.wcf/templates/sitemap.tpl deleted file mode 100644 index e21b443933..0000000000 --- a/com.woltlab.wcf/templates/sitemap.tpl +++ /dev/null @@ -1,23 +0,0 @@ -
- {hascontent} -
- - - {foreach from=$tree item=sitemapName} - - {/foreach} -
- {hascontentelse} - {@$sitemap} - {/hascontent} -
\ No newline at end of file diff --git a/com.woltlab.wcf/templates/sitemapUserAccount.tpl b/com.woltlab.wcf/templates/sitemapUserAccount.tpl deleted file mode 100644 index 4b2391ad15..0000000000 --- a/com.woltlab.wcf/templates/sitemapUserAccount.tpl +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js b/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js index 6ff3dd0a95..12f9851787 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js @@ -8,11 +8,11 @@ */ define( [ - 'Ajax', 'WoltLab/WCF/Bootstrap', 'WoltLab/WCF/Controller/Sitemap', 'WoltLab/WCF/Controller/Style/Changer', + 'Ajax', 'WoltLab/WCF/Bootstrap', 'WoltLab/WCF/Controller/Style/Changer', 'WoltLab/WCF/Controller/Popover', 'WoltLab/WCF/Ui/User/Ignore' ], function( - Ajax, Bootstrap, ControllerSitemap, ControllerStyleChanger, + Ajax, Bootstrap, ControllerStyleChanger, ControllerPopover, UiUserIgnore ) { @@ -32,8 +32,6 @@ define( setup: function(options) { Bootstrap.setup(); - ControllerSitemap.setup(); - if (options.styleChanger) { //ControllerStyleChanger.setup(); } diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Controller/Sitemap.js b/wcfsetup/install/files/js/WoltLab/WCF/Controller/Sitemap.js deleted file mode 100644 index 4bc22cb555..0000000000 --- a/wcfsetup/install/files/js/WoltLab/WCF/Controller/Sitemap.js +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Provides the sitemap dialog. - * - * @author Alexander Ebert - * @copyright 2001-2015 WoltLab GmbH - * @license GNU Lesser General Public License - * @module WoltLab/WCF/Controller/Sitemap - */ -define(['Ajax', 'EventHandler', 'Language', 'Dom/Util', 'Ui/Dialog', 'Ui/TabMenu'], function(Ajax, EventHandler, Language, DomUtil, UiDialog, UiTabMenu) { - "use strict"; - - var _cache = []; - - /** - * @exports WoltLab/WCF/Controller/Sitemap - */ - return { - /** - * Binds click handler. - */ - setup: function() { - elBySel('#sitemap > a').addEventListener(WCF_CLICK_EVENT, this.open.bind(this)); - }, - - /** - * Handles clicks on the sitemap button. - * - * @param {Event} event event object - */ - open: function(event) { - event.preventDefault(); - - UiDialog.open(this); - }, - - _ajaxSetup: function() { - return { - data: { - actionName: 'getSitemap', - className: 'wcf\\data\\sitemap\\SitemapAction' - } - }; - }, - - _ajaxSuccess: function(data) { - _cache.push(data.returnValues.sitemapName); - - elById('sitemap_' + data.returnValues.sitemapName).children[0].innerHTML = data.returnValues.template; - }, - - _dialogSetup: function() { - return { - id: 'sitemapDialog', - options: { - title: Language.get('wcf.page.sitemap') - }, - source: { - data: { - actionName: 'getSitemap', - className: 'wcf\\data\\sitemap\\SitemapAction' - }, - after: (function(content, data) { - _cache.push(data.returnValues.sitemapName); - - var tabMenuContainer = elBySel('.tabMenuContainer', content); - var menuId = DomUtil.identify(tabMenuContainer); - - UiTabMenu.getTabMenu(menuId).select('sitemap_' + data.returnValues.sitemapName); - - EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + menuId, 'select', this.showTab.bind(this)); - }).bind(this) - } - }; - }, - - /** - * Callback for tab links, lazy loads content. - * - * @param {object} tabData tab data - */ - showTab: function(tabData) { - var name = elAttr(tabData.active, 'data-name').replace(/^sitemap_/, ''); - - if (_cache.indexOf(name) === -1) { - Ajax.api(this, { - parameters: { - sitemapName: name - } - }); - } - } - }; -}); diff --git a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php b/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php deleted file mode 100644 index 017f84353f..0000000000 --- a/wcfsetup/install/files/lib/data/sitemap/Sitemap.class.php +++ /dev/null @@ -1,79 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage data.sitemap - * @category Community Framework - * - * @property-read integer $sitemapID - * @property-read integer $packageID - * @property-read string $sitemapName - * @property-read string $className - * @property-read integer $showOrder - * @property-read string $permissions - * @property-read string $options - */ -class Sitemap extends DatabaseObject { - use TDatabaseObjectOptions; - use TDatabaseObjectPermissions; - - /** - * ISitemapProvider object - * @var \wcf\system\sitemap\ISitemapProvider - */ - protected $sitemapObj = null; - - /** - * database table for this object - * @var string - */ - protected static $databaseTableName = 'sitemap'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'sitemapID'; - - /** - * Returns parsed template for current sitemap. - * - * @return string - * @throws SystemException - */ - public function getTemplate() { - if ($this->sitemapObj === null) { - if (empty($this->className) || !class_exists($this->className)) { - throw new SystemException("Unable to find class '".$this->className."' for sitemap '".$this->sitemapName."'"); - } - - if (!is_subclass_of($this->className, ISitemapProvider::class)) { - throw new ImplementationException($this->className, ISitemapProvider::class); - } - - $this->sitemapObj = new $this->className(); - } - - return $this->sitemapObj->getTemplate(); - } - - /** - * Returns true, if the active user has access to this sitemap. - * - * @return boolean - */ - public function isAccessible() { - return $this->validateOptions() && $this->validatePermissions(); - } -} diff --git a/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php b/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php deleted file mode 100644 index 768b9bad3c..0000000000 --- a/wcfsetup/install/files/lib/data/sitemap/SitemapAction.class.php +++ /dev/null @@ -1,63 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage data.sitemap - * @category Community Framework - * - * @method Sitemap create() - * @method SitemapEditor[] getObjects() - * @method SitemapEditor getSingleObject() - */ -class SitemapAction extends AbstractDatabaseObjectAction { - /** - * @inheritDoc - */ - protected $allowGuestAccess = ['getSitemap']; - - /** - * Validates the 'getSitemap' action. - */ - public function validateGetSitemap() { - if (isset($this->parameters['sitemapName'])) { - SitemapHandler::getInstance()->validateSitemapName($this->parameters['sitemapName']); - } - } - - /** - * Returns sitemap for active application group. - * - * @return array - */ - public function getSitemap() { - if (isset($this->parameters['sitemapName'])) { - return [ - 'sitemapName' => $this->parameters['sitemapName'], - 'template' => SitemapHandler::getInstance()->getSitemap($this->parameters['sitemapName']) - ]; - } - else { - $sitemapName = SitemapHandler::getInstance()->getDefaultSitemapName(); - - WCF::getTPL()->assign([ - 'defaultSitemapName' => $sitemapName, - 'sitemap' => SitemapHandler::getInstance()->getSitemap($sitemapName), - 'tree' => SitemapHandler::getInstance()->getTree() - ]); - - return [ - 'sitemapName' => $sitemapName, - 'template' => WCF::getTPL()->fetch('sitemap') - ]; - } - } -} diff --git a/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php b/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php deleted file mode 100644 index 96b3733f8e..0000000000 --- a/wcfsetup/install/files/lib/data/sitemap/SitemapEditor.class.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage data.sitemap - * @category Community Framework - * - * @method Sitemap getDecoratedObject() - * @mixin Sitemap - */ -class SitemapEditor extends DatabaseObjectEditor { - /** - * @inheritDoc - */ - protected static $baseClass = Sitemap::class; -} diff --git a/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php b/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php deleted file mode 100644 index c2c89ff563..0000000000 --- a/wcfsetup/install/files/lib/data/sitemap/SitemapList.class.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage data.sitemap - * @category Community Framework - * - * @method Sitemap current() - * @method Sitemap[] getObjects() - * @method Sitemap|null search($objectID) - * @property Sitemap[] $objects - */ -class SitemapList extends DatabaseObjectList { } diff --git a/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php deleted file mode 100644 index af8f0bf8d7..0000000000 --- a/wcfsetup/install/files/lib/system/cache/builder/SitemapCacheBuilder.class.php +++ /dev/null @@ -1,26 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage system.cache.builder - * @category Community Framework - */ -class SitemapCacheBuilder extends AbstractCacheBuilder { - /** - * @inheritDoc - */ - public function rebuild(array $parameters) { - $sitemapList = new SitemapList(); - $sitemapList->sqlOrderBy = "sitemap.showOrder ASC"; - $sitemapList->readObjects(); - - return $sitemapList->getObjects(); - } -} diff --git a/wcfsetup/install/files/lib/system/package/plugin/SitemapPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/SitemapPackageInstallationPlugin.class.php deleted file mode 100644 index 38eedfed91..0000000000 --- a/wcfsetup/install/files/lib/system/package/plugin/SitemapPackageInstallationPlugin.class.php +++ /dev/null @@ -1,80 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage system.package.plugin - * @category Community Framework - */ -class SitemapPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin { - /** - * @inheritDoc - */ - public $className = SitemapEditor::class; - - /** - * @inheritDoc - */ - protected function handleDelete(array $items) { - $sql = "DELETE FROM wcf".WCF_N."_".$this->tableName." - WHERE sitemapName = ? - AND packageID = ?"; - $statement = WCF::getDB()->prepareStatement($sql); - foreach ($items as $item) { - $statement->execute([ - $item['attributes']['name'], - $this->installation->getPackageID() - ]); - } - } - - /** - * @inheritDoc - */ - protected function prepareImport(array $data) { - $showOrder = (isset($data['elements']['showOrder'])) ? intval($data['elements']['showOrder']) : null; - $showOrder = $this->getShowOrder($showOrder, null, 'showOrder'); - - return [ - 'sitemapName' => $data['attributes']['name'], - 'className' => $data['elements']['classname'], - 'showOrder' => $showOrder, - 'options' => (isset($data['elements']['options'])) ? $data['elements']['options'] : '', - 'permissions' => (isset($data['elements']['permissions'])) ? $data['elements']['permissions'] : '' - ]; - } - - /** - * @inheritDoc - */ - protected function findExistingItem(array $data) { - $sql = "SELECT * - FROM wcf".WCF_N."_".$this->tableName." - WHERE sitemapName = ? - AND packageID = ?"; - $parameters = [ - $data['sitemapName'], - $this->installation->getPackageID() - ]; - - return [ - 'sql' => $sql, - 'parameters' => $parameters - ]; - } - - /** - * @inheritDoc - */ - protected function cleanup() { - SitemapCacheBuilder::getInstance()->reset(); - } -} diff --git a/wcfsetup/install/files/lib/system/sitemap/ISitemapProvider.class.php b/wcfsetup/install/files/lib/system/sitemap/ISitemapProvider.class.php deleted file mode 100644 index 8b3f9ef823..0000000000 --- a/wcfsetup/install/files/lib/system/sitemap/ISitemapProvider.class.php +++ /dev/null @@ -1,21 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage system.sitemap - * @category Community Framework - */ -interface ISitemapProvider { - /** - * Returns the parsed sitemap template. - * - * @return string - */ - public function getTemplate(); -} diff --git a/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php b/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php deleted file mode 100644 index 7079a38184..0000000000 --- a/wcfsetup/install/files/lib/system/sitemap/SitemapHandler.class.php +++ /dev/null @@ -1,106 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage sitemap.sitemap - * @category Community Framework - */ -class SitemapHandler extends SingletonFactory { - /** - * sitemap cache - * @var Sitemap[] - */ - protected $cache = null; - - /** - * @inheritDoc - */ - protected function init() { - $this->cache = SitemapCacheBuilder::getInstance()->getData(); - } - - /** - * Returns array of tree items or an empty array if only one sitemap is registered. - * - * @return Sitemap[] - */ - public function getTree() { - $tree = []; - - if (!empty($this->cache)) { - foreach ($this->cache as $sitemap) { - if ($sitemap->isAccessible()) $tree[] = $sitemap->sitemapName; - } - } - - return $tree; - } - - /** - * Returns default sitemap name. - * - * @return string - */ - public function getDefaultSitemapName() { - foreach ($this->cache as $sitemap) { - if ($sitemap->packageID == PACKAGE_ID && $sitemap->isAccessible()) { - return $sitemap->sitemapName; - } - } - - foreach ($this->cache as $sitemap) { - if ($sitemap->isAccessible()) return $sitemap->sitemapName; - } - - return ''; - } - - /** - * Returns sitemap for given sitemap name. - * - * @param string $sitemapName - * @return \wcf\data\sitemap\Sitemap - */ - public function getSitemap($sitemapName) { - foreach ($this->cache as $sitemap) { - if ($sitemap->sitemapName == $sitemapName) { - return $sitemap->getTemplate(); - } - } - - return null; - } - - /** - * Validates sitemap name. - * - * @param string $sitemapName - * @throws SystemException - */ - public function validateSitemapName($sitemapName) { - if (empty($sitemapName)) { - throw new SystemException("Empty sitemap name provided"); - } - - $isValid = false; - foreach ($this->cache as $sitemap) { - if ($sitemap->sitemapName == $sitemapName) { - $isValid = true; - } - } - - if (!$isValid) { - throw new SystemException("Sitemap name '".$sitemapName."' is unknown"); - } - } -} diff --git a/wcfsetup/install/files/lib/system/sitemap/UserAccountSitemapProvider.class.php b/wcfsetup/install/files/lib/system/sitemap/UserAccountSitemapProvider.class.php deleted file mode 100644 index 3365170960..0000000000 --- a/wcfsetup/install/files/lib/system/sitemap/UserAccountSitemapProvider.class.php +++ /dev/null @@ -1,22 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage system.sitemap - * @category Community Framework - */ -class UserAccountSitemapProvider implements ISitemapProvider { - /** - * @inheritDoc - */ - public function getTemplate() { - return WCF::getTPL()->fetch('sitemapUserAccount'); - } -} diff --git a/wcfsetup/install/files/style/ui/sitemap.scss b/wcfsetup/install/files/style/ui/sitemap.scss deleted file mode 100644 index a518d7708d..0000000000 --- a/wcfsetup/install/files/style/ui/sitemap.scss +++ /dev/null @@ -1,34 +0,0 @@ -.sitemapList { - h3 { - padding-bottom: 5px; - - @include wcfFontHeadline; - } - - a { - display: block; - padding: 2px 10px; - - &:hover { - background-color: $wcfTabularBoxBackgroundActive; - } - } - - > li { - &:not(:first-child) { - border-top: 1px solid $wcfContentBorderInner; - margin-top: 15px; - padding-top: 15px; - } - - > ul > li { - > a { - padding-left: 20px; - } - - > ul > li > a { - padding-left: 40px; - } - } - } -} diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 3c0579f30c..bfd4cf887d 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2503,10 +2503,8 @@ Fehler sind beispielsweise: - - Weitere Informationen]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index e7fa7873a9..294770dbd6 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2540,10 +2540,8 @@ Errors are: - - More details]]> diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index e1075d5dbf..55e574d4a4 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1060,18 +1060,6 @@ CREATE TABLE wcf1_session_virtual ( UNIQUE KEY (sessionID, ipAddress, userAgent) ); -DROP TABLE IF EXISTS wcf1_sitemap; -CREATE TABLE wcf1_sitemap ( - sitemapID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY, - packageID INT(10) NOT NULL, - sitemapName VARCHAR(80) NOT NULL DEFAULT '', - className VARCHAR(255) NOT NULL DEFAULT '', - showOrder INT(10) NOT NULL DEFAULT 0, - permissions TEXT NULL, - options TEXT NULL, - UNIQUE KEY sitemapName (packageID, sitemapName) -); - DROP TABLE IF EXISTS wcf1_smiley; CREATE TABLE wcf1_smiley ( smileyID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1760,8 +1748,6 @@ ALTER TABLE wcf1_session ADD FOREIGN KEY (parentPageID) REFERENCES wcf1_page (pa ALTER TABLE wcf1_session_virtual ADD FOREIGN KEY (sessionID) REFERENCES wcf1_session (sessionID) ON DELETE CASCADE ON UPDATE CASCADE; -ALTER TABLE wcf1_sitemap ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE; - ALTER TABLE wcf1_smiley ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE; ALTER TABLE wcf1_smiley ADD FOREIGN KEY (categoryID) REFERENCES wcf1_category (categoryID) ON DELETE SET NULL; -- 2.20.1