summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/tests/File_Structure_Test.php27
-rw-r--r--core/views/kohana_profiler.php35
2 files changed, 49 insertions, 13 deletions
diff --git a/core/tests/File_Structure_Test.php b/core/tests/File_Structure_Test.php
index 4fb58916..8b328993 100644
--- a/core/tests/File_Structure_Test.php
+++ b/core/tests/File_Structure_Test.php
@@ -113,21 +113,22 @@ class File_Structure_Test extends Unit_Test_Case {
class GalleryCodeFilterIterator extends FilterIterator {
public function accept() {
- // Skip anything that we didn't write
+ // Skip anything that we didn"t write
$path_name = $this->getInnerIterator()->getPathName();
- $path_name = strtr($path_name, DIRECTORY_SEPARATOR, '/');
+ $path_name = strtr($path_name, DIRECTORY_SEPARATOR, "/");
return !(
strpos($path_name, ".svn") ||
- substr($path_name, -1, 1) == "~" ||
- strpos($path_name, DOCROOT . 'test') !== false ||
- strpos($path_name, DOCROOT . 'var') !== false ||
- strpos($path_name, MODPATH . 'forge') !== false ||
- strpos($path_name, MODPATH . 'kodoc') !== false ||
- strpos($path_name, MODPATH . 'mptt') !== false ||
- strpos($path_name, MODPATH . 'unit_test') !== false ||
- strpos($path_name, MODPATH . 'gallery_unit_test/views/kohana_error_page.php') !== false ||
- strpos($path_name, MODPATH . 'gallery_unit_test/views/kohana_unit_test.php') !== false ||
- strpos($path_name, MODPATH . 'user/libraries/PasswordHash') !== false ||
- strpos($path_name, SYSPATH) !== false);
+ strpos($path_name, "core/views/kohana_profiler.php") !== false ||
+ strpos($path_name, DOCROOT . "test") !== false ||
+ strpos($path_name, DOCROOT . "var") !== false ||
+ strpos($path_name, MODPATH . "forge") !== false ||
+ strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
+ strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test.php") !== false ||
+ strpos($path_name, MODPATH . "kodoc") !== false ||
+ strpos($path_name, MODPATH . "mptt") !== false ||
+ strpos($path_name, MODPATH . "unit_test") !== false ||
+ strpos($path_name, MODPATH . "user/libraries/PasswordHash") !== false ||
+ strpos($path_name, SYSPATH) !== false ||
+ substr($path_name, -1, 1) == "~");
}
}
diff --git a/core/views/kohana_profiler.php b/core/views/kohana_profiler.php
new file mode 100644
index 00000000..fd28f1ae
--- /dev/null
+++ b/core/views/kohana_profiler.php
@@ -0,0 +1,35 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<style type="text/css">
+ #kohana-profiler {
+ font-family: Monaco, 'Courier New';
+ background-color: #F8FFF8;
+ margin-top: 20px;
+ clear: both;
+ padding: 10px 10px 0;
+ border: 1px solid #E5EFF8;
+ text-align: left;
+ }
+ #kohana-profiler pre {
+ margin: 0;
+ font: inherit;
+ }
+ #kohana-profiler .kp-meta {
+ margin: 0 0 10px;
+ padding: 4px;
+ background: #FFF;
+ border: 1px solid #E5EFF8;
+ color: #A6B0B8;
+ text-align: center;
+ }
+ #kohana-profiler td {
+ padding-right: 1em;
+ }
+ <? echo $styles ?>
+</style>
+
+<div id="kohana-profiler">
+ <? foreach ($profiles as $profile): ?>
+ <?= $profile->render(); ?>
+ <? endforeach; ?>
+ <p class="kp-meta">Profiler executed in <?= number_format($execution_time, 3) ?>s</p>
+</div>