make it work again

Author: splitbrain

syntax.php

@@ -5,13 +5,6 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Andreas Gohr <[email protected]>
  */
-
-if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__).'/../../').'/');
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
-require_once(DOKU_PLUGIN.'syntax.php');
-require_once(DOKU_INC.'inc/search.php');
-require_once(DOKU_INC.'inc/JpegMeta.php');
-
 class syntax_plugin_panoview extends DokuWiki_Syntax_Plugin {
 
     /**
@@ -102,8 +95,6 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
     function render($mode, Doku_Renderer $R, $data) {
         if($mode != 'xhtml') return false;
         global $ID;
-        require_once(DOKU_INC.'inc/JSON.php');
-        $json = new JSON();
 
         $img = '<a href="'.ml($data['image'], array('id'=> $ID), false).'"><img src="'.
             ml($data['image'], array('w'=> $data['width'], 'h'=> $data['height'])).'" width="'.
@@ -126,7 +117,7 @@ function render($mode, Doku_Renderer $R, $data) {
                 <span class="zoomOut" title="Zoom Out">-</span>
                 <span class="maximize"><img src="'.DOKU_BASE.'lib/plugins/panoview/gfx/window.gif" style="position: absolute; bottom: 4px; right: 5px;" title="Maximize"></span>
               </p>
-                <div class="options" style="display:none">'.hsc($json->encode($data)).'</div>
+                <div class="options" style="display:none">'.hsc(json_encode($data)).'</div>
             </div>
         ';
 
@@ -257,7 +248,4 @@ function tile_unlock($d) {
         @rmdir($lockDir);
         @ignore_user_abort(0);
     }
-
 }
-
-//Setup VIM: ex: et ts=4 enc=utf-8 :

tiles.php

@@ -7,15 +7,13 @@
 if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__).'/../../../').'/');
 define('DOKU_DISABLE_GZIP_OUTPUT', 1);
 require_once(DOKU_INC.'inc/init.php');
-require_once(DOKU_INC.'inc/common.php');
-require_once(DOKU_INC.'inc/pageutils.php');
-require_once(DOKU_INC.'inc/httputils.php');
-require_once(DOKU_INC.'inc/pluginutils.php');
-require_once(DOKU_INC.'inc/auth.php');
 session_write_close();
 
+global $conf;
+
+
 /** @var syntax_plugin_panoview $pl */
-$pl =& plugin_load('syntax', 'panoview');
+$pl = plugin_load('syntax', 'panoview');
 
 $data = array();
 // get parameters
@@ -62,10 +60,10 @@
 
 // send
 header('Content-type: image/jpeg');
-http_conditionalRequest(max($data['mtime'], $data['selft']));
+http_conditionalRequest(max($data['mtime'], $data['cachet']));
 
 //use x-sendfile header to pass the delivery to compatible webservers
-if(http_sendfile($data['cache'])) exit;
+http_sendfile($data['cache']);
 
 // send file contents
 $fp = @fopen($data['cache'], "rb");
@@ -75,6 +73,3 @@
     header("HTTP/1.0 500 Internal Server Error");
     print "Could not read tile - bad permissions?";
 }
-
-
-//Setup VIM: ex: et ts=4 enc=utf-8 :