Minor ACP/WCFSetup improvements, WCF is now always ID 1

In theory it would have been possible that WCF has a package id different from the value "1", but there is no way to achieve this unless you're manually screwing things up. This is no longer supported and the whole system will fail if you go full retard.

diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl
index ce53d47ebf2eecc5aa516855df63f5b7dfbae4a5..ff18047ae1439cb169fa96ff84167dfd7d444d28 100644 (file)
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@ -1,9 +1,25 @@
 <p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
 
 {if ENABLE_DEBUG_MODE} 
+       <script type="text/javascript">
+               //<![CDATA[
+               $(function() {
+                       $('#benchmarkDetails > li > span').click(function() {
+                               $(this).parent().children('pre').toggle();
+                       });
+               });
+               //]]>
+       </script>
        <ul id="benchmarkDetails" style="display: none;">
-               {foreach from=$__wcf->getBenchmark()->getItems() item=item}
-                       <li style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>{if $item.type == 1}(SQL Query) {/if}{$item.text}<br /><small style="font-size: .85em">Execution time: {@$item.use}s</small></li>
+               {foreach from=$__wcf->getBenchmark()->getItems() key=benchmarkIndex item=item}
+                       <li id="benchmarkItem{@$benchmarkIndex}" style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>
+                               <span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br />
+                               <small style="font-size: .85em">Execution time: {@$item.use}s</small>
+                               
+                               <pre style="display: none">{foreach from=$item.trace key=traceNo item=traceItem}#{#$traceNo} {if !$traceItem.class|empty}{$traceItem.class}{$traceItem.type}{else}{if !$traceItem.file|empty}{$traceItem.file}: {/if}{/if}{$traceItem.function}() {if !$traceItem.line|empty}(line {#$traceItem.line}){/if} 
+{/foreach}</pre>
+                               
+                       </li>
                {/foreach}
        </ul>
        

diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
index b4eebc42b3b48628725d8e1004a4d3aba0c985db..e34ef2a8e30ae462383d2012974547f6108714a6 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
@@ -132,9 +132,8 @@ class IndexPage extends AbstractPage {
         * @see wcf\page\IPage::show()
         */
        public function show() {
-               $wcfPackageID = WCFACP::getWcfPackageID();
                // check package installation queue
-               if ($wcfPackageID == 0) {
+               if ($this->action == 'WCFSetup') {
                        $queueID = PackageInstallationDispatcher::checkPackageInstallationQueue();
                        
                        if ($queueID) {

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index faa243ce678d4f4c86fbe527ba973e9de5583379..95b0698c6ebce532ca619979f9e920c7adbd1ae0 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -143,29 +143,10 @@ class WCFACP extends WCF {
        protected function initPackage() {
                // define active package id
                if (!defined('PACKAGE_ID')) {
-                       $packageID = self::getWcfPackageID();
-                       define('PACKAGE_ID', $packageID);
+                       define('PACKAGE_ID', 1);
                }
        }
        
-       /**
-        * Returns the package id of the wcf package.
-        * 
-        * @return      integer
-        */
-       public static final function getWcfPackageID() {
-               // try to find package wcf id
-               $sql = "SELECT  packageID
-                       FROM    wcf".WCF_N."_package
-                       WHERE   package = 'com.woltlab.wcf'";
-               $statement = WCFACP::getDB()->prepareStatement($sql);
-               $statement->execute();
-               $package = $statement->fetchArray();
-               
-               if (!$package) return 0;
-               else return $package['packageID'];
-       }
-       
        /**
         * Returns a list of all installed applications packages.
         * 

diff --git a/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php b/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php
index d55f04de793276cee5e8eccd8b8f6d397304045d..58875d0f9d8d1599023280398f7b2646f854f631 100644 (file)
--- a/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php
+++ b/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php
@@ -36,7 +36,7 @@ class SessionAccessLogListener implements IEventListener {
                        if (!empty($row['sessionLogID'])) {
                                $sessionLogID = $row['sessionLogID'];
                                
-                               $sessionLogEditor = new ACPSessionLogEditor(new ACPSessionLog($sessionLogID));
+                               $sessionLogEditor = new ACPSessionLogEditor(new ACPSessionLog(null, array('sessionLogID' => $sessionLogID)));
                                $sessionLogEditor->update(array(
                                        'lastActivityTime' => TIME_NOW
                                ));

diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 6b0c5e02a7190f71952f478345800607051caf94..c412c2cde5ffe3deb302c1a54baca7480a8b0f0f 100644 (file)
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -9,6 +9,7 @@
 <form method="get" action="{@RELATIVE_WCF_DIR}acp/index.php">
        <div class="wcf-formSubmit">
                {@SID_INPUT_TAG}
+               <input type="hidden" name="action" value="WCFSetup" />
        </div>
 </form>