Skip to content

Commit 4e65208

Browse files
BurntimeXBurntimeX
committed
Rename property for additional parameters
1 parent a747c0d commit 4e65208

File tree

9 files changed

+22
-39
lines changed

9 files changed

+22
-39
lines changed

‎XSD/menuItem.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<xs:element name="page" type="woltlab_varchar" minOccurs="1" maxOccurs="1" />
4444
<xs:element name="parent" type="woltlab_varchar" minOccurs="0" maxOccurs="1" />
4545
<xs:element name="externalURL" type="woltlab_varchar" minOccurs="0" maxOccurs="1" />
46-
<xs:element name="additionalInternalURL" type="woltlab_varchar" minOccurs="0" maxOccurs="1" />
46+
<xs:element name="urlParameters" type="woltlab_varchar" minOccurs="0" maxOccurs="1" />
4747
</xs:choice>
4848
</xs:extension>
4949
</xs:complexContent>

‎wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.2_step1.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
use wcf\system\database\table\column\IntDatabaseTableColumn;
1212
use wcf\system\database\table\column\MediumtextDatabaseTableColumn;
13+
use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
1314
use wcf\system\database\table\index\DatabaseTableForeignKey;
1415
use wcf\system\database\table\index\DatabaseTableIndex;
1516
use wcf\system\database\table\PartialDatabaseTable;
@@ -68,4 +69,9 @@
6869
->columns([
6970
MediumtextDatabaseTableColumn::create('exifData'),
7071
]),
72+
PartialDatabaseTable::create('wcf1_menu_item')
73+
->columns([
74+
NotNullVarchar255DatabaseTableColumn::create('urlParameters')
75+
->defaultValue(''),
76+
]),
7177
];

‎wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3.php‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,8 @@ protected function createForm()
210210
->fieldId('pageID')
211211
->values(\array_keys($pageHandlers))
212212
),
213-
TextFormField::create('additionalInternalURL')
214-
->label('wcf.acp.menu.item.additionalInternalURL')
215-
->description('wcf.acp.menu.item.additionalInternalURL.description')
213+
TextFormField::create('urlParameters')
214+
->label('wcf.acp.menu.item.urlParameters')
216215
->maximumLength(255)
217216
->addDependency(
218217
ValueFormFieldDependency::create('isInternalLinkDependency')

‎wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @property-read int $isDisabled is `1` if the menu item is disabled and thus not shown in the menu, otherwise `0`
3333
* @property-read int $originIsSystem is `1` if the menu item has been delivered by a package, otherwise `0` (if the menu item has been created by an admin in the ACP)
3434
* @property-read int $packageID id of the package the which delivers the menu item or `1` if it has been created in the ACP
35-
* @property-read string $additionalInternalURL
35+
* @property-read string $urlParameters
3636
*/
3737
class MenuItem extends DatabaseObject implements ITitledObject
3838
{
@@ -94,12 +94,12 @@ public function getURL()
9494
if ($this->pageObjectID) {
9595
$handler = $this->getMenuPageHandler();
9696
if ($handler && $handler instanceof ILookupPageHandler) {
97-
return $handler->getLink($this->pageObjectID) . $this->additionalInternalURL;
97+
return $handler->getLink($this->pageObjectID) . $this->urlParameters;
9898
}
9999
}
100100

101101
if ($this->pageID) {
102-
return $this->getPage()->getLink() . $this->additionalInternalURL;
102+
return $this->getPage()->getLink() . $this->urlParameters;
103103
} else {
104104
return WCF::getLanguage()->get($this->externalURL);
105105
}

‎wcfsetup/install/files/lib/system/package/plugin/MenuItemPackageInstallationPlugin.class.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ protected function prepareImport(array $data)
155155
}
156156

157157
$externalURL = (!empty($data['elements']['externalURL'])) ? $data['elements']['externalURL'] : '';
158-
$additionalInternalURL = $data['elements']['additionalInternalURL'] ?? '';
158+
$urlParameters = $data['elements']['urlParameters'] ?? '';
159159

160160
if ($pageID === null && empty($externalURL)) {
161161
throw new SystemException("The menu item '" . $data['attributes']['identifier'] . "' must either have an associated page or an external url set.");
162162
} elseif ($pageID !== null && !empty($externalURL)) {
163163
throw new SystemException("The menu item '" . $data['attributes']['identifier'] . "' can either have an associated page or an external url, but not both.");
164-
} elseif ($pageID === null && !empty($additionalInternalURL)) {
165-
throw new SystemException("The menu item '" . $data['attributes']['identifier'] . "' can not have an additional internal URL set if it does not have an associated page.");
164+
} elseif ($pageID === null && !empty($urlParameters)) {
165+
throw new SystemException("The menu item '" . $data['attributes']['identifier'] . "' can not have an additional URL parameters set if it does not have an associated page.");
166166
}
167167

168168
return [
@@ -174,7 +174,7 @@ protected function prepareImport(array $data)
174174
'parentItemID' => $parentItemID,
175175
'showOrder' => $this->getItemOrder($menuID, $parentItemID),
176176
'title' => $this->getI18nValues($data['elements']['title']),
177-
'additionalInternalURL' => $additionalInternalURL,
177+
'urlParameters' => $urlParameters,
178178
];
179179
}
180180

@@ -394,8 +394,8 @@ protected function addFormFields(IFormDocument $form)
394394
->values(['internal'])
395395
),
396396

397-
TextFormField::create('additionalInternalURL')
398-
->label('wcf.acp.pip.menuItem.additionalInternalURL')
397+
TextFormField::create('urlParameters')
398+
->label('wcf.acp.pip.menuItem.urlParameters')
399399
->maximumLength(255)
400400
->addDependency(
401401
ValueFormFieldDependency::create('linkType')
@@ -481,7 +481,7 @@ protected function fetchElementData(\DOMElement $element, $saveData)
481481
$data['title'][LanguageFactory::getInstance()->getLanguageByCode($title->getAttribute('language'))->languageID] = $title->nodeValue;
482482
}
483483

484-
foreach (['externalURL', 'menu', 'page', 'parent', 'additionalInternalURL'] as $optionalElementName) {
484+
foreach (['externalURL', 'menu', 'page', 'parent', 'urlParameters'] as $optionalElementName) {
485485
$optionalElement = $element->getElementsByTagName($optionalElementName)->item(0);
486486
if ($optionalElement !== null) {
487487
$data[$optionalElementName] = $optionalElement->nodeValue;

‎wcfsetup/install/lang/de.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,8 +1230,7 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
12301230
<item name="wcf.acp.menu.item.parentItem"><![CDATA[Übergeordneter Menüpunkt]]></item>
12311231
<item name="wcf.acp.menu.link.other"><![CDATA[Sonstiges]]></item>
12321232
<item name="wcf.acp.menu.item.pageObjectID.error.invalid"><![CDATA[Die eingetragene ID ist ungültig.]]></item>
1233-
<item name="wcf.acp.menu.item.additionalInternalURL"><![CDATA[Zusätzliche interne URL-Parameter]]></item>
1234-
<item name="wcf.acp.menu.item.additionalInternalURL.description"><![CDATA[Zusätzliche Parameter die an die URL angehangen werden können. Idealweise sollten dieser mit <kbd>&</kbd> oder <kbd>#</kbd> beginnen.]]></item>
1233+
<item name="wcf.acp.menu.item.urlParameters"><![CDATA[Zusätzliche URL-Parameter]]></item>
12351234
<item name="wcf.acp.menu.link.contact"><![CDATA[Kontaktformular]]></item>
12361235
<item name="wcf.acp.menu.link.contact.options"><![CDATA[Eingabefelder]]></item>
12371236
<item name="wcf.acp.menu.link.contact.recipients"><![CDATA[Empfänger]]></item>

‎wcfsetup/install/lang/en.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,8 +1206,7 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
12061206
<item name="wcf.acp.menu.item.parentItem"><![CDATA[Parent Menu Item]]></item>
12071207
<item name="wcf.acp.menu.link.other"><![CDATA[Other]]></item>
12081208
<item name="wcf.acp.menu.item.pageObjectID.error.invalid"><![CDATA[ID is invalid.]]></item>
1209-
<item name="wcf.acp.menu.item.additionalInternalURL"><![CDATA[Additional internal URL parameters]]></item>
1210-
<item name="wcf.acp.menu.item.additionalInternalURL.description"><![CDATA[Additional parameters that can be appended to the URL. Ideally, these should starts with <kbd>&</kbd> or <kbd>#</kbd>.]]></item>
1209+
<item name="wcf.acp.menu.item.urlParameters"><![CDATA[Additional URL Parameters]]></item>
12111210
<item name="wcf.acp.menu.link.contact"><![CDATA[Contact Form]]></item>
12121211
<item name="wcf.acp.menu.link.contact.options"><![CDATA[Option Fields]]></item>
12131212
<item name="wcf.acp.menu.link.contact.recipients"><![CDATA[Recipient]]></item>

‎wcfsetup/setup/db/install.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ CREATE TABLE wcf1_menu_item (
836836
isDisabled TINYINT(1) NOT NULL DEFAULT 0,
837837
originIsSystem TINYINT(1) NOT NULL DEFAULT 0,
838838
packageID INT(10) NOT NULL,
839-
additionalInternalURL VARCHAR(255) NOT NULL DEFAULT ''
839+
urlParameters VARCHAR(255) NOT NULL DEFAULT ''
840840
);
841841

842842
DROP TABLE IF EXISTS wcf1_message_embedded_object;

0 commit comments

Comments
 (0)