Added hidden option for branding

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 79cad215918946192e18205e9ce5a84cd1c2cb43..ae866080a8307a067971f093249506e964a8060a 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -268,6 +268,13 @@
                                <hidden>1</hidden>
                        </option>
                        
+                       <option name="woltlab_branding">
+                               <categoryname>general</categoryname>
+                               <optiontype>integer</optiontype>
+                               <defaultvalue>1</defaultvalue>
+                               <hidden>1</hidden>
+                       </option>
+                       
                        <option name="module_master_password">
                                <categoryname>module.system</categoryname>
                                <optiontype>boolean</optiontype>

diff --git a/com.woltlab.wcf/templates/pageFooter.tpl b/com.woltlab.wcf/templates/pageFooter.tpl
index 2500fb4509730541fdc7ba92383b75f9c9064798..13d61a9107b67a89902032100b03ae054a39aa99 100644 (file)
--- a/com.woltlab.wcf/templates/pageFooter.tpl
+++ b/com.woltlab.wcf/templates/pageFooter.tpl
@@ -13,15 +13,19 @@
                </div>
        {/hascontent}
        
-       <div id="pageFooterCopyright" class="pageFooterCopyright">
-               <div class="layoutBoundary">
-                       {event name='footerContents'}
-                       
-                       {if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
-                       
-                       {include file='pageFooterCopyright'}
+       {hascontent}
+               <div id="pageFooterCopyright" class="pageFooterCopyright">
+                       <div class="layoutBoundary">
+                               {content}
+                                       {event name='footerContents'}
+                                       
+                                       {if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
+                                       
+                                       {include file='pageFooterCopyright'}
+                               {/content}
+                       </div>
                </div>
-       </div>
+       {/hascontent}
        
        {if MODULE_WCF_AD && $__disableAds|empty}
                {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}

diff --git a/com.woltlab.wcf/templates/pageFooterCopyright.tpl b/com.woltlab.wcf/templates/pageFooterCopyright.tpl
index da3d9b069f56461e705513eb26cd880b2ccaa51c..91f7dd66ac2171d34f15d39e1e7c5cb7cd29f826 100644 (file)
--- a/com.woltlab.wcf/templates/pageFooterCopyright.tpl
+++ b/com.woltlab.wcf/templates/pageFooterCopyright.tpl
@@ -1,3 +1,3 @@
 {event name='copyright'}
 
-<div class="copyright">{lang}wcf.page.copyright{/lang}</div>
+{if !'WOLTLAB_BRANDING'|defined || WOLTLAB_BRANDING}<div class="copyright">{lang}wcf.page.copyright{/lang}</div>{/if}

diff --git a/constants.php b/constants.php
index a1ee0684e25e9526524e0ae9c92c434377738aa0..4840b1566da303abf48723d15c9e1ff30618e7c5 100644 (file)
--- a/constants.php
+++ b/constants.php
@@ -27,6 +27,7 @@ define('SECURITY_TOKEN_INPUT_TAG', '');
 // option constants
 define('LAST_UPDATE_TIME', 0);
 define('WCF_UUID', 'bd096261-15f4-5dc1-9767-01ce08d7c80b');
+define('WOLTLAB_BRANDING', 1);
 define('MODULE_MASTER_PASSWORD', 0);
 define('ENABLE_DEBUG_MODE', 1);
 define('ENABLE_BENCHMARK', 0);