]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 953fdd3)
Touch ups for diagnostics plugin
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 22 Feb 2011 07:41:37 +0000 (07:41 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 22 Feb 2011 07:41:37 +0000 (07:41 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8422 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/diagnostics/actions/download.php patch | blob | history
mod/diagnostics/views/default/admin/utilities/diagnostics.php patch | blob | history
mod/diagnostics/views/default/diagnostics/forms/download.php patch | blob | history

diff --git a/mod/diagnostics/actions/download.php b/mod/diagnostics/actions/download.php
index a79527f78df8de7110641f4e9b46e3868497bc8e..97775c92ea3f37d515a43bbd988a7ce4aee220bb 100644 (file)
--- a/mod/diagnostics/actions/download.php
+++ b/mod/diagnostics/actions/download.php
@@ -1,21 +1,18 @@
 <?php
-       /**
-        * Elgg diagnostics
-        *
-        * @package ElggDiagnostics
-        */
+/**
+ * Elgg diagnostics
+ *
+ * @package ElggDiagnostics
+ */
 
-       admin_gatekeeper();
+$output = elgg_echo('diagnostics:header', array(date('r'), elgg_get_logged_in_user_entity()->name));
+$output = elgg_trigger_plugin_hook('diagnostics:report', 'system', null, $output);
 
-       $output = elgg_echo('diagnostics:header', array(date('r'), elgg_get_logged_in_user_entity()->name));
-       $output = elgg_trigger_plugin_hook('diagnostics:report', 'system', null, $output);
+header("Cache-Control: public");
+header("Content-Description: File Transfer");
+header('Content-disposition: attachment; filename=elggdiagnostic.txt');
+header("Content-Type: text/plain");
+header('Content-Length: ' . strlen($output));
 
-       header("Cache-Control: public");
-       header("Content-Description: File Transfer");
-       header('Content-disposition: attachment; filename=elggdiagnostic.txt');
-       header("Content-Type: text/plain");
-       header('Content-Length: '. strlen($output));
-
-       echo $output;
-       exit;
-?>
\ No newline at end of file
+echo $output;
+exit;
diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/utilities/diagnostics.php
index 9b5da95f74b3e270cf2f76217c3c4c0fb4357af5..c17e67c28f2009b1de89ef94110ba93aaa012064 100644 (file)
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/utilities/diagnostics.php
@@ -3,7 +3,7 @@
 
 $diagnostics_title = elgg_echo('diagnostics:report');
 $diagnostics = elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view('diagnostics/forms/download');
+$diagnostics .= elgg_view_form('diagnostics/download');
 
 // unit tests
 $unit_tests_title = elgg_echo('diagnostics:unittester');
@@ -14,8 +14,8 @@ if (elgg_get_config('debug')) {
        // create a button to run tests
        $params = array(
                'text' => elgg_echo('diagnostics:test:executeall'),
-               'href' => elgg_get_site_url() . 'engine/tests/suite.php',
-               'class' => 'elgg-button-submit',
+               'href' => 'engine/tests/suite.php',
+               'class' => 'elgg-button elgg-button-submit',
        );
        $unit_tests .= elgg_view('output/url', $params);
 } else {
@@ -24,21 +24,7 @@ if (elgg_get_config('debug')) {
 }
 
 // display admin body
-echo <<<HTML
-<div class="elgg-module elgg-module-inline">
-       <div class="elgg-head">
-               <h3>$diagnostics_title</h3>
-       </div>
-       <div class="elgg-body">
-               $diagnostics
-       </div>
-</div>
-<div class="elgg-module elgg-module-inline">
-       <div class="elgg-head">
-               <h3>$unit_tests_title</h3>
-       </div>
-       <div class="elgg-body">
-               $unit_tests
-       </div>
-</div>
-HTML;
+
+echo elgg_view_module('inline', $diagnostics_title, $diagnostics);
+
+echo elgg_view_module('inline', $unit_tests_title, $unit_tests);
\ No newline at end of file
diff --git a/mod/diagnostics/views/default/diagnostics/forms/download.php b/mod/diagnostics/views/default/diagnostics/forms/download.php
index 7f48a7608e0819c3b52bf553cd24d5259abb109a..e80d42a39505b3b0105fc63cb29f791acc083251 100644 (file)
--- a/mod/diagnostics/views/default/diagnostics/forms/download.php
+++ b/mod/diagnostics/views/default/diagnostics/forms/download.php
@@ -3,6 +3,8 @@
  * Elgg diagnostics
  * 
  * @package ElggDiagnostics
+ * 
+ * @deprecated 1.8
  */
 
 elgg_deprecated_notice("Use elgg_view_form('diagnostics/download') instead of elgg_view('diagnostics/forms/download')", 1.8);
Social Networking Engine