Changed package names/versions

* Renamed bundle to WoltLab Suite
* Renamed WCF to WoltLab Suite Core
* Changed core version to 3.0

diff --git a/README.md b/README.md
index 75a12a7d1ed2467b8e15b8e40924914446c7ea6c..e5a7285daa16fb6a012a4127d61dc189ccf48cb2 100644 (file)
--- 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 d29cd457734a556678d69e3bd20200f927c004c5..d04d3f5fb2e49caf49b3da53a605266e1c35100e 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package name="com.woltlab.wcf" xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/package.xsd">
        <packageinformation>
-               <packagename>WoltLab Community Framework</packagename>
+               <packagename>WoltLab Suite Core</packagename>
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.2.0 Alpha 2</version> <!-- codename: vortex -->
-               <date>2015-10-22</date>
+               <version>3.0.0 Alpha 2</version> <!-- codename: vortex -->
+               <date>2016-06-14</date>
        </packageinformation>
        
        <authorinformation>

diff --git a/com.woltlab.wcf/templates/pageFooterCopyright.tpl b/com.woltlab.wcf/templates/pageFooterCopyright.tpl
index 3a3b99f8ed89d2943e4904f837614e4033eee390..da3d9b069f56461e705513eb26cd880b2ccaa51c 100644 (file)
--- a/com.woltlab.wcf/templates/pageFooterCopyright.tpl
+++ b/com.woltlab.wcf/templates/pageFooterCopyright.tpl
@@ -1,3 +1,3 @@
 {event name='copyright'}
 
-{if $__wcf->isActiveApplication()}<div class="copyright">{lang}wcf.index.copyright{/lang}</div>{/if}
+<div class="copyright">{lang}wcf.page.copyright{/lang}</div>

diff --git a/wcfsetup/install/files/acp/templates/pageFooter.tpl b/wcfsetup/install/files/acp/templates/pageFooter.tpl
index 8d3f5f0903fdcac86f91c7909e75ec3fed1e859d..93ceb72c3077d6c1c028f1adf1bc50b2e0dac874 100644 (file)
--- 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}
                        
-                       <div class="copyright"><a href="https://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a>{event name='copyright'}</div>
+                       {event name='copyright'}
+                       
+                       <div class="copyright">{lang}wcf.page.copyright{/lang}</div>
                </div>
        </div>
 </footer>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 9918db238753001b0ef0c9563aad3e2fc7abbfb8..084729ffb6cbc08396005153c322c503b08f5d60 100644 (file)
--- 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 5eeb1f8c2e6e107ddf46650dcce144f0b1053d72..05ea7225906d2cb39ba0de7f7c63aca034c2b31c 100644 (file)
--- 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 eaf7c280515193fe05219777062ff87b9531e3d0..967c51b8933170ab2b633c9cfeb8d6dd5c4f47a8 100644 (file)
--- 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 857f96f69cef33047a095a4549e150ee0ade2427..6ca10cd6f60a9bbffdf3d7b289d1222f874d3be7 100644 (file)
--- 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 79f2b90254b3214eec79b5035ec08b41d1f3d828..e2ea991c077eb458f23a26df82711593c40e0a54 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -434,7 +434,7 @@
        </category>
        
        <category name="wcf.acp.index">
-               <item name="wcf.acp.index.credits"><![CDATA[Über WoltLab&reg; Community Framework]]></item>
+               <item name="wcf.acp.index.credits"><![CDATA[Über WoltLab Suite&trade;]]></item>
                <item name="wcf.acp.index.credits.contributor"><![CDATA[Mitwirkende]]></item>
                <item name="wcf.acp.index.credits.designer"><![CDATA[Design]]></item>
                <item name="wcf.acp.index.credits.developedBy"><![CDATA[Software entwickelt von]]></item>
@@ -450,7 +450,7 @@
                <item name="wcf.acp.index.setup.title"><![CDATA[Bitte warten]]></item>
                <item name="wcf.acp.index.system"><![CDATA[System]]></item>
                <item name="wcf.acp.index.system.software"><![CDATA[Software]]></item>
-               <item name="wcf.acp.index.system.software.wcfVersion"><![CDATA[Community Framework&trade;-Version]]></item>
+               <item name="wcf.acp.index.system.software.wcfVersion"><![CDATA[WoltLab Suite&trade;-Version]]></item>
                <item name="wcf.acp.index.system.server"><![CDATA[Server]]></item>
                <item name="wcf.acp.index.system.os"><![CDATA[Betriebssystem]]></item>
                <item name="wcf.acp.index.system.webserver"><![CDATA[Webserver]]></item>
@@ -2541,6 +2541,7 @@ Fehler sind beispielsweise:
                <item name="wcf.page.requestedPage"><![CDATA[Aufgerufene Seite]]></item>
                <item name="wcf.page.cookiePolicy.info"><![CDATA[Diese Seite verwendet Cookies. Durch die Nutzung unserer Seite erklären Sie sich damit einverstanden, dass wir Cookies setzen. <a href="{page}com.woltlab.wcf.CookiePolicy{/page}">Weitere Informationen</a>]]></item>
                <item name="wcf.page.comments"><![CDATA[Kommentare]]></item>
+               <item name="wcf.page.copyright"><![CDATA[<a href="https://www.woltlab.com/de/" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>Community-Software: <strong>WoltLab Suite&trade;{if SHOW_VERSION_NUMBER} {@WCF_VERSION}{/if}</strong></a>]]></item>
                
                <item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[Benutzerprofil von <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
        </category>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 1efe846d9b1e5cf318f404eb15792948de9d10f4..d9536e50b561faa1df18f3cce3a06e18db83fcfe 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -434,7 +434,7 @@ Examples for medium ID detection:
        </category>
        
        <category name="wcf.acp.index">
-               <item name="wcf.acp.index.credits"><![CDATA[About WoltLab&reg; Community Framework]]></item>
+               <item name="wcf.acp.index.credits"><![CDATA[About WoltLab Suite&trade;]]></item>
                <item name="wcf.acp.index.credits.contributor"><![CDATA[Contributions]]></item>
                <item name="wcf.acp.index.credits.designer"><![CDATA[Designer]]></item>
                <item name="wcf.acp.index.credits.developedBy"><![CDATA[Software developed by]]></item>
@@ -450,7 +450,7 @@ Examples for medium ID detection:
                <item name="wcf.acp.index.setup.title"><![CDATA[Please Wait]]></item>
                <item name="wcf.acp.index.system"><![CDATA[System]]></item>
                <item name="wcf.acp.index.system.software"><![CDATA[Software]]></item>
-               <item name="wcf.acp.index.system.software.wcfVersion"><![CDATA[Community Framework&trade; Version]]></item>
+               <item name="wcf.acp.index.system.software.wcfVersion"><![CDATA[WoltLab Suite&trade; Version]]></item>
                <item name="wcf.acp.index.system.server"><![CDATA[Server]]></item>
                <item name="wcf.acp.index.system.os"><![CDATA[Operating System]]></item>
                <item name="wcf.acp.index.system.webserver"><![CDATA[Web Server]]></item>
@@ -2578,6 +2578,7 @@ Errors are:
                <item name="wcf.page.requestedPage"><![CDATA[Requested Page]]></item>
                <item name="wcf.page.cookiePolicy.info"><![CDATA[This site uses cookies. By continuing to browse this site, you are agreeing to our use of cookies. <a href="{page}com.woltlab.wcf.CookiePolicy{/page}">More details</a>]]></item>
                <item name="wcf.page.comments"><![CDATA[Comments]]></item>
+               <item name="wcf.page.copyright"><![CDATA[<a href="https://www.woltlab.com" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>Powered by <strong>WoltLab Suite&trade;{if SHOW_VERSION_NUMBER} {@WCF_VERSION}{/if}</strong></a>]]></item>
                
                <item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
        </category>

diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index 183f956358960a2e0c58f12e9cf665d353d90566..7dd0b4a44ca1657de31e2b52d7be164012891486 100644 (file)
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de" languagename="Deutsch">
        <category name="wcf.global">
-               <item name="wcf.global.title"><![CDATA[{$setupPackageName} Installation]]></item>
+               <item name="wcf.global.title"><![CDATA[WoltLab Suite&trade; Installation]]></item>
                <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item>
                <item name="wcf.global.decimalPoint"><![CDATA[,]]></item>
                <item name="wcf.global.thousandsSeparator"><![CDATA[.]]></item>
                <item name="wcf.global.button.next"><![CDATA[Weiter »]]></item>
                <item name="wcf.global.progressBar"><![CDATA[{@$progress}% fertiggestellt]]></item>
-               <item name="wcf.global.welcome"><![CDATA[Vielen Dank, dass Sie sich für {$setupPackageName} entschieden haben!]]></item>
-               <item name="wcf.global.welcome.description"><![CDATA[Dieser Installationsassistent hilft Ihnen bei der Einrichtung von <br><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} und von <b>{$setupPackageName}</b>{/if}.]]></item>
+               <item name="wcf.global.welcome"><![CDATA[Vielen Dank, dass Sie sich für WoltLab Suite&trade; entschieden haben!]]></item>
+               <item name="wcf.global.welcome.description"><![CDATA[Dieser Installationsassistent hilft Ihnen bei der Einrichtung von <strong>WoltLab Suite&trade;</strong>.]]></item>
                <item name="wcf.global.welcome.language"><![CDATA[Sprache]]></item>
                <item name="wcf.global.welcome.language.description"><![CDATA[Die Sprache dieses Assistenten ist zurzeit {@$languageChooser}]]></item>
                <item name="wcf.global.welcome.language.change"><![CDATA[Sprache wechseln]]></item>

diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index c27e0e4b186979ba93a15c8d6918e24ca8e46676..64f08c34452629b23eb839e6db1e4c2af67e9911 100644 (file)
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="en" languagename="English">
        <category name="wcf.global">
-               <item name="wcf.global.title"><![CDATA[{$setupPackageName} Installation]]></item>
+               <item name="wcf.global.title"><![CDATA[WoltLab Suite&trade; Installation]]></item>
                <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item> <!-- system variable; do not translate -->
                <item name="wcf.global.decimalPoint"><![CDATA[.]]></item>
                <item name="wcf.global.thousandsSeparator"><![CDATA[,]]></item>
                <item name="wcf.global.button.next"><![CDATA[Next »]]></item>
                <item name="wcf.global.progressBar"><![CDATA[{@$progress}% complete]]></item>
-               <item name="wcf.global.welcome"><![CDATA[Thank you for choosing {$setupPackageName}!]]></item>
-               <item name="wcf.global.welcome.description"><![CDATA[This installer will help you to install <br><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} and <b>{$setupPackageName}</b>{/if}.]]></item>
+               <item name="wcf.global.welcome"><![CDATA[Thank you for choosing WoltLab Suite&trade;!]]></item>
+               <item name="wcf.global.welcome.description"><![CDATA[This installer will help you to install <strong>WoltLab Suite&trade;</strong>.]]></item>
                <item name="wcf.global.welcome.language"><![CDATA[Language]]></item>
                <item name="wcf.global.welcome.language.description"><![CDATA[The installer language is currently set to {@$languageChooser}]]></item>
                <item name="wcf.global.welcome.language.change"><![CDATA[Change Language]]></item>

diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl
index 7eef4d9e099c2eb3f5e6f6f51727be61fd041250..3abbba17d1b0ea2ce2812ec50a8c62b4576f3831 100644 (file)
--- a/wcfsetup/setup/template/footer.tpl
+++ b/wcfsetup/setup/template/footer.tpl
@@ -5,7 +5,7 @@
                <footer id="pageFooter" class="pageFooter">
                        <div id="pageFooterCopyright" class="pageFooterCopyright">
                                <div class="layoutBoundary">
-                                       <div class="copyright"><a href="https://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a></div>
+                                       <div class="copyright"><a href="https://www.woltlab.com" rel="nofollow">Powered by <strong>WoltLab Suite&trade; {@WCF_VERSION}</strong></a></div>
                                </div>
                        </div>
                </footer>

diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index 628c692d00e0e30b2472027c1e0c1d2d442eb929..6cdb78d8a73d9abe8a4ae2e0f4b3703dbf455f19 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -45,6 +45,7 @@
                                        <header class="contentHeader">
                                                <div class="contentHeaderTitle">
                                                        <h1 class="contentTitle">{lang}wcf.global.title{/lang}</h1>
+                                                       <p class="contentHeaderDescription">{implode from=$setupPackageNames item='setupPackageName'}{'/^WoltLab Suite /'|preg_replace:'':$setupPackageName}{/implode}</p>
                                                        <p class="contentHeaderDescription"><progress id="packageInstallationProgress" value="{@$progress}" max="100" style="width: 300px;" title="{@$progress}%">{@$progress}%</progress></p>
                                                </div>
                                        </header>

diff --git a/wcfsetup/setup/template/stepConfigureDirectories.tpl b/wcfsetup/setup/template/stepConfigureDirectories.tpl
index d3c6bc09b64903e2105c5526b64c7bf0ebaf7b58..4972405fda77b918afa90c90e883be5c0fef0766 100644 (file)
--- a/wcfsetup/setup/template/stepConfigureDirectories.tpl
+++ b/wcfsetup/setup/template/stepConfigureDirectories.tpl
@@ -14,7 +14,7 @@
                {foreach from=$showOrder item=$application}
                        <dl{if $errors[$application]|isset} class="formError"{/if}>
                                <dt>
-                                       <label for="application_{$application}">{$packages[$application][packageName]}</label>
+                                       <label for="application_{$application}">{'/^WoltLab Suite /'|preg_replace:'':$packages[$application][packageName]}</label>
                                </dt>
                                <dd>
                                        <input type="text" id="application_{$application}" class="long jsApplicationDirectory" name="directories[{$application}]" value="{$directories[$application]}">