Merge pull request #903 from jeroenvermeulen/feature/esi-decoder-show…

…-content ESI Decoder: Button to show block content.
nexcess · Aug 31, 2015 · 4863821 · 4863821
2 parents bc4c3eb + fe1ac74
commit 4863821
Showing 1 changed file with 27 additions and 9 deletions.
diff --git a/contrib/tools/esi-decoder.php b/contrib/tools/esi-decoder.php
@@ -7,13 +7,21 @@
  *
  * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
  *
- * If the URLs you see in "varnishlog" or "varnishncsa", read this FAQ item:
+ * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
  * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs
  *
  */
 
-// You might need to fix the path to your app/Mage.php on the line below.
-require_once dirname(__FILE__).'/../../app/Mage.php';
+$tries = 5;
+$dir = dirname(__FILE__);
+while( $tries-- && ! file_exists( $dir . '/app/Mage.php' ) ) {
+    $dir = dirname($dir); // go one dir up
+}
+if ( file_exists( $dir . '/app/Mage.php' ) ) {
+    require_once $dir . '/app/Mage.php';
+} else {
+    die( "Could not find 'app/Mage.php'. Please edit esi-decoder.php and 'require' it manually." );
+}
 
 Mage::app();
 $data = ( empty($_REQUEST['data']) ) ? '' : $_REQUEST['data'];
@@ -69,7 +77,12 @@
     }
     $dataHelper = Mage::helper( 'turpentine/data' );
     $esiDataArray = $dataHelper->thaw( $processData );
-?>
+    $showContentUrl = Mage::getUrl( 'turpentine/esi/getBlock',
+        array( 'method' => 'esi',
+               'ttl' => 0,
+               'hmac' => $dataHelper->getHmac( $processData ),
+               'data' => $processData ) );
+    ?>
     <div class="center">=&nbsp; DATA &nbsp;=</div>
     <div class="result">
         <pre><?php echo htmlentities( var_export( $esiDataArray, 1 ) ); ?></pre>
@@ -78,14 +91,19 @@
     $refPreg = preg_quote( $esiHelper->getEsiReferrerParam(), '|' );
     if ( preg_match('|'.$refPreg.'/([\w\.\-]+),*|', $data, $matches) ):
         $processData = $matches[1];
+        ?>
+        <div class="center">=&nbsp; REFERRER &nbsp;=</div>
+        <div class="result">
+            <pre><?php echo htmlentities( $dataHelper->urlBase64Decode( $processData ) ); ?></pre>
+        </div>
+<?php
+    endif; // if preg_match referrer
 ?>
-    <div class="center">=&nbsp; REFERRER &nbsp;=</div>
-    <div class="result">
-        <pre><?php echo htmlentities( $dataHelper->urlBase64Decode( $processData ) ); ?></pre>
+    <div class="center">
+        <input type="button" value="SHOW CONTENT" onclick='window.open(<?php echo json_encode($showContentUrl); ?>,"_blank");' />
     </div>
 <?php
-    endif;
-endif;
+endif; // if $data
 ?>
 </body>
 </html>