From 359841c361110edf452bec0249553b51278dc2f0 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 14 Jun 2016 17:33:53 +0200 Subject: [PATCH] Changed package names/versions * Renamed bundle to WoltLab Suite * Renamed WCF to WoltLab Suite Core * Changed core version to 3.0 --- README.md | 2 +- com.woltlab.wcf/package.xml | 6 ++-- .../templates/pageFooterCopyright.tpl | 2 +- .../files/acp/templates/pageFooter.tpl | 4 ++- .../install/files/lib/system/WCF.class.php | 4 +-- .../files/lib/system/WCFSetup.class.php | 33 ++++++++----------- .../files/lib/util/HTTPRequest.class.php | 2 +- wcfsetup/install/files/options.inc.php | 1 + wcfsetup/install/lang/de.xml | 5 +-- wcfsetup/install/lang/en.xml | 5 +-- wcfsetup/setup/lang/setup_de.xml | 6 ++-- wcfsetup/setup/lang/setup_en.xml | 6 ++-- wcfsetup/setup/template/footer.tpl | 2 +- wcfsetup/setup/template/header.tpl | 1 + .../template/stepConfigureDirectories.tpl | 2 +- 15 files changed, 40 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 75a12a7d1e..e5a7285daa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -WoltLab Community Framework 2.2 +WoltLab Suite Core 3.0 =============================== WoltLab Community Framework is a free web-framework, designed and developed for complex community applications. The framework applies the latest and most modern technologies, it is structured completly object-oriented, constantly enhanced and forms the base for all WoltLab products. diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index d29cd45773..d04d3f5fb2 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -1,12 +1,12 @@ - WoltLab Community Framework + WoltLab Suite Core 1 - 2.2.0 Alpha 2 - 2015-10-22 + 3.0.0 Alpha 2 + 2016-06-14 diff --git a/com.woltlab.wcf/templates/pageFooterCopyright.tpl b/com.woltlab.wcf/templates/pageFooterCopyright.tpl index 3a3b99f8ed..da3d9b069f 100644 --- a/com.woltlab.wcf/templates/pageFooterCopyright.tpl +++ b/com.woltlab.wcf/templates/pageFooterCopyright.tpl @@ -1,3 +1,3 @@ {event name='copyright'} -{if $__wcf->isActiveApplication()}
{lang}wcf.index.copyright{/lang}
{/if} +
{lang}wcf.page.copyright{/lang}
diff --git a/wcfsetup/install/files/acp/templates/pageFooter.tpl b/wcfsetup/install/files/acp/templates/pageFooter.tpl index 8d3f5f0903..93ceb72c30 100644 --- a/wcfsetup/install/files/acp/templates/pageFooter.tpl +++ b/wcfsetup/install/files/acp/templates/pageFooter.tpl @@ -5,7 +5,9 @@ {if ENABLE_BENCHMARK}{include file='benchmark'}{/if} -
Copyright © 2001-2016 WoltLab® GmbH{event name='copyright'}
+ {event name='copyright'} + +
{lang}wcf.page.copyright{/lang}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 9918db2387..084729ffb6 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -46,8 +46,8 @@ if (!@ini_get('date.timezone')) { @date_default_timezone_set('Europe/London'); } -// define current wcf version -define('WCF_VERSION', '2.2.0 Alpha 1 (Vortex)'); +// define current woltlab suite version +define('WCF_VERSION', '3.0.0 Alpha 2'); // define current unix timestamp define('TIME_NOW', time()); diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 5eeb1f8c2e..05ea722590 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -78,12 +78,6 @@ class WCFSetup extends WCF { */ protected static $installedFiles = []; - /** - * name of installed primary application - * @var string - */ - protected static $setupPackageName = 'WoltLab Community Framework'; - /** * indicates if developer mode is used to install * @var boolean @@ -104,7 +98,7 @@ class WCFSetup extends WCF { $this->initTPL(); /** @noinspection PhpUndefinedMethodInspection */ self::getLanguage()->loadLanguage(); - $this->getPackageName(); + $this->getPackageNames(); // start setup $this->setup(); @@ -1230,31 +1224,30 @@ class WCFSetup extends WCF { } /** - * Gets the package name of the first application in WCFSetup.tar.gz. + * Gets the package names of the bundled applications in WCFSetup.tar.gz. */ - protected static function getPackageName() { + protected static function getPackageNames() { // get package name + $packageNames = []; $tar = new Tar(SETUP_FILE); foreach ($tar->getContentList() as $file) { if ($file['type'] != 'folder' && mb_strpos($file['filename'], 'install/packages/') === 0) { $packageFile = basename($file['filename']); - $packageName = preg_replace('!\.(tar\.gz|tgz|tar)$!', '', $packageFile); - if ($packageName != 'com.woltlab.wcf') { - try { - $archive = new PackageArchive(TMP_DIR.'install/packages/'.$packageFile); - $archive->openArchive(); - self::$setupPackageName = $archive->getLocalizedPackageInfo('packageName'); - $archive->getTar()->close(); - break; - } - catch (SystemException $e) {} + try { + $archive = new PackageArchive(TMP_DIR.'install/packages/'.$packageFile); + $archive->openArchive(); + $packageNames[] = $archive->getLocalizedPackageInfo('packageName'); + $archive->getTar()->close(); } + catch (SystemException $e) {} } } $tar->close(); + sort($packageNames); + // assign package name - WCF::getTPL()->assign(['setupPackageName' => self::$setupPackageName]); + WCF::getTPL()->assign(['setupPackageNames' => $packageNames]); } } diff --git a/wcfsetup/install/files/lib/util/HTTPRequest.class.php b/wcfsetup/install/files/lib/util/HTTPRequest.class.php index eaf7c28051..967c51b893 100644 --- a/wcfsetup/install/files/lib/util/HTTPRequest.class.php +++ b/wcfsetup/install/files/lib/util/HTTPRequest.class.php @@ -145,7 +145,7 @@ final class HTTPRequest { $this->setOptions($options); // set default headers - $this->addHeader('user-agent', "HTTP.PHP (HTTPRequest.class.php; WoltLab Community Framework/".WCF_VERSION."; ".WCF::getLanguage()->languageCode.")"); + $this->addHeader('user-agent', "HTTP.PHP (HTTPRequest.class.php; WoltLab Suite/".WCF_VERSION."; ".WCF::getLanguage()->languageCode.")"); $this->addHeader('accept', '*/*'); $this->addHeader('accept-language', WCF::getLanguage()->getFixedLanguageCode()); diff --git a/wcfsetup/install/files/options.inc.php b/wcfsetup/install/files/options.inc.php index 857f96f69c..6ca10cd6f6 100644 --- a/wcfsetup/install/files/options.inc.php +++ b/wcfsetup/install/files/options.inc.php @@ -36,5 +36,6 @@ define('EXTERNAL_LINK_TARGET_BLANK', 0); define('URL_LEGACY_MODE', 0); define('URL_TO_LOWERCASE', 1); define('SEARCH_ENGINE', 'mysql'); +define('SHOW_VERSION_NUMBER', 1); define('WCF_OPTION_INC_PHP_SUCCESS', true); diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 79f2b90254..e2ea991c07 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -434,7 +434,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -2541,6 +2541,7 @@ Fehler sind beispielsweise: Weitere Informationen]]> + Community-Software: WoltLab Suite™{if SHOW_VERSION_NUMBER} {@WCF_VERSION}{/if}]]> userID}">{$user->username}]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 1efe846d9b..d9536e50b5 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -434,7 +434,7 @@ Examples for medium ID detection: - + @@ -450,7 +450,7 @@ Examples for medium ID detection: - + @@ -2578,6 +2578,7 @@ Errors are: More details]]> + Powered by WoltLab Suite™{if SHOW_VERSION_NUMBER} {@WCF_VERSION}{/if}]]> userID}">{$user->username}]]> diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index 183f956358..7dd0b4a44c 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -1,14 +1,14 @@ - + - - WoltLab Community Framework{if $setupPackageName != 'WoltLab Community Framework'} und von {$setupPackageName}{/if}.]]> + + WoltLab Suite™.]]> diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml index c27e0e4b18..64f08c3445 100644 --- a/wcfsetup/setup/lang/setup_en.xml +++ b/wcfsetup/setup/lang/setup_en.xml @@ -1,14 +1,14 @@ - + - - WoltLab Community Framework{if $setupPackageName != 'WoltLab Community Framework'} and {$setupPackageName}{/if}.]]> + + WoltLab Suite™.]]> diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl index 7eef4d9e09..3abbba17d1 100644 --- a/wcfsetup/setup/template/footer.tpl +++ b/wcfsetup/setup/template/footer.tpl @@ -5,7 +5,7 @@ diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl index 628c692d00..6cdb78d8a7 100644 --- a/wcfsetup/setup/template/header.tpl +++ b/wcfsetup/setup/template/header.tpl @@ -45,6 +45,7 @@

{lang}wcf.global.title{/lang}

+

{implode from=$setupPackageNames item='setupPackageName'}{'/^WoltLab Suite /'|preg_replace:'':$setupPackageName}{/implode}

{@$progress}%

diff --git a/wcfsetup/setup/template/stepConfigureDirectories.tpl b/wcfsetup/setup/template/stepConfigureDirectories.tpl index d3c6bc09b6..4972405fda 100644 --- a/wcfsetup/setup/template/stepConfigureDirectories.tpl +++ b/wcfsetup/setup/template/stepConfigureDirectories.tpl @@ -14,7 +14,7 @@ {foreach from=$showOrder item=$application}
- +
-- 2.20.1