From eb54556f37bc8b7f5252ebfe42109edcfc1de395 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <timwolla@arcor.de>
Date: Wed, 8 Feb 2012 17:18:27 +0100
Subject: [PATCH] Show language and compiled templates in CacheListPage
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

And collapse the containers by default, as there are now 5 “Sources”
---
 .../install/files/acp/templates/cacheList.tpl |  4 +-
 .../lib/acp/page/CacheListPage.class.php      | 54 ++++++++++---------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 8bcfbb09a2..4daf5766e0 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -62,12 +62,12 @@
 	{counter name=cacheIndex assign=cacheIndex print=false start=0}
 	{if $files|count}
 		<div class="wcf-border wcf-boxTitle">
-			<a class="collapsible" data-is-open="1" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
+			<a class="collapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
 			<hgroup>
 				<h1>{$cache} <span class="badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
 			</hgroup>
 			
-			<table id="cache{@$cacheIndex}">
+			<table id="cache{@$cacheIndex}" style="display: none;">
 				<thead>
 					<tr>
 						<th class="columnTitle">{lang}wcf.acp.cache.list.name{/lang}</th>
diff --git a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
index c1f6d353a0..c3fde1d5e4 100755
--- a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
@@ -71,6 +71,30 @@ class CacheListPage extends AbstractPage {
 			'files' => 0
 		);
 		
+		$_this = $this;
+		$readFileCache = function($cacheDir) use ($_this) {
+			$_this->caches[$cacheDir] = array();
+			
+			// get files in cache directory
+			$files = glob($cacheDir.'/*.php');
+			// get additional file information
+			if (is_array($files)) {
+				foreach ($files as $file) {
+					$filesize = filesize($file);
+					$_this->caches[$cacheDir][] = array(
+						'filename' => basename($file),
+						'filesize' => $filesize,
+						'mtime' => filemtime($file),
+						'perm' => substr(sprintf('%o', fileperms($file)), -3),
+						'writable' => is_writable($file)
+					);
+					
+					$_this->cacheData['files']++;
+					$_this->cacheData['size'] += $filesize;
+				}
+			}
+		};
+		
 		// filesystem cache
 		if ($this->cacheData['source'] == 'wcf\system\cache\source\DiskCacheSource') {
 			// set version
@@ -88,29 +112,7 @@ class CacheListPage extends AbstractPage {
 			$statement->execute($conditions->getParameters());
 			while ($row = $statement->fetchArray()) {
 				$packageDir = FileUtil::getRealPath(WCF_DIR.$row['packageDir']);
-				$cacheDir = $packageDir.'cache';
-				if (file_exists($cacheDir)) {
-					$this->caches[$cacheDir] = array();
-
-					// get files in cache directory
-					$files = glob($cacheDir.'/*.php');
-					// get additional file information
-					if (is_array($files)) {
-						foreach ($files as $file) {
-							$filesize = filesize($file);
-							$this->caches[$cacheDir][] = array(
-								'filename' => basename($file),
-								'filesize' => $filesize,
-								'mtime' => filemtime($file),
-								'perm' => substr(sprintf('%o', fileperms($file)), -3),
-								'writable' => is_writable($file)
-							);
-							
-							$this->cacheData['files']++;
-							$this->cacheData['size'] += $filesize;
-						}
-					}
-				}
+				$readFileCache($packageDir.'cache');
 			}
 		}
 		// memcache
@@ -150,7 +152,7 @@ class CacheListPage extends AbstractPage {
 			foreach ($cacheList as $cache) {
 				$cachePath = FileUtil::addTrailingSlash(FileUtil::unifyDirSeperator(dirname($cache['info'])));
 				if (isset($packageNames[$cachePath])) {
-					// Use the pacakgeName + the instance number, because pathes could confuse the administrator.
+					// Use the packageName + the instance number, because pathes could confuse the administrator.
 					// He could think this is a file cache. If instanceName would be unique, we could use it instead.
 					$packageName = $packageNames[$cachePath];
 					if (!isset($this->caches[$packageName])) $this->caches[$packageName] = array();
@@ -172,6 +174,10 @@ class CacheListPage extends AbstractPage {
 			$this->cacheData['version'] = WCF_VERSION;
 			$this->cacheData['files'] = $this->cacheData['size'] = 0;
 		}
+		
+		$readFileCache(WCF_DIR.'language');
+		$readFileCache(WCF_DIR.'templates/compiled');
+		$readFileCache(WCF_DIR.'acp/templates/compiled');
 	}
 	
 	/**
-- 
2.20.1