BugTrack/2434 Improve props transfer on Searching

[pukiwiki/pukiwiki.git] / skin / keitai.skin.php

diff --git a/skin/keitai.skin.php b/skin/keitai.skin.php
index 0705286..fe6de67 100644 (file)
--- a/skin/keitai.skin.php
+++ b/skin/keitai.skin.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: keitai.skin.php,v 1.10 2005/07/05 13:23:34 henoheno Exp $
-// Copyright (C) 2003-2005 PukiWiki Developers Team
+// $Id: keitai.skin.php,v 1.16 2006/01/09 10:37:05 henoheno Exp $
+// Copyright (C) 2003-2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
 // Skin for Embedded devices
@@ -10,36 +10,42 @@
 // Prohibit direct access
 if (! defined('UI_LANG')) die('UI_LANG is not set');
 
-global $max_size, $accesskey, $menubar;
+$pageno = (isset($vars['p']) && is_numeric($vars['p'])) ? $vars['p'] : 0;
+$edit = (isset($vars['cmd'])    && $vars['cmd']    == 'edit') ||
+       (isset($vars['plugin']) && $vars['plugin'] == 'edit');
+
+global $max_size, $accesskey, $menubar, $_symbol_anchor;
+$max_size = --$max_size * 1024; // Make 1KByte spare (for $navi, etc)
 $link = $_LINK;
 $rw = ! PKWK_READONLY;
 
-// Output HTTP headers
-pkwk_headers_sent();
-if(TRUE) {
-       // Force Shift JIS encode for Japanese embedded browsers and devices
-       header('Content-Type: text/html; charset=Shift_JIS');
-       $title = mb_convert_encoding($title, 'SJIS', SOURCE_ENCODING);
-       $body  = mb_convert_encoding($body,  'SJIS', SOURCE_ENCODING);
-} else {
-       header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
-}
+// ----
+// Modify
 
-// Make 1KByte spare (for header, etc)
-$max_size = --$max_size * 1024;
+// Ignore &dagger;s
+$body = preg_replace('#<a[^>]+>' . preg_quote($_symbol_anchor, '#') . '</a>#', '', $body);
 
-// Replace IMG tags (= images) with character strings
+// Shrink IMG tags (= images) with character strings
 // With ALT option
 $body = preg_replace('#(<div[^>]+>)?(<a[^>]+>)?<img[^>]*alt="([^"]+)"[^>]*>(?(2)</a>)(?(1)</div>)#i', '[$3]', $body);
 // Without ALT option
 $body = preg_replace('#(<div[^>]+>)?(<a[^>]+>)?<img[^>]+>(?(2)</a>)(?(1)</div>)#i', '[img]', $body);
 
-// Page numbers, divided by this skin
-$pageno = (isset($vars['p']) && is_numeric($vars['p'])) ? $vars['p'] : 0;
+// ----
+
+// Check content volume, Page numbers, divided by this skin
 $pagecount = ceil(strlen($body) / $max_size);
-$lastpage = $pagecount - 1;
 
+// Too large contents to edit
+if ($edit && $pagecount > 1)
+       die('Unable to edit: Too large contents for your device');
+
+// Get one page
+$body = substr($body, $pageno * $max_size, $max_size);
+
+// ----
 // Top navigation (text) bar
+
 $navi = array();
 $navi[] = '<a href="' . $link['top']  . '" ' . $accesskey . '="0">0.Top</a>';
 if ($rw) {
@@ -53,7 +59,7 @@ if ($rw) {
                }
        }
 }
-$navi[] = '<a href="' . $script . '?' . $menubar . '" ' . $accesskey . '="4">4.Menu</a>';
+$navi[] = '<a href="' . $script . '?' . pagename_urlencode($menubar) . '" ' . $accesskey . '="4">4.Menu</a>';
 $navi[] = '<a href="' . $link['recent'] . '" ' . $accesskey . '="5">5.Recent</a>';
 
 // Previous / Next block
@@ -65,14 +71,25 @@ if ($pagecount > 1) {
                        '&amp;p=' . $prev . '" ' . $accesskey . '="7">7.Prev</a>';
        }
        $navi[] = $next . '/' . $pagecount . ' ';
-       if ($pageno < $lastpage) {
+       if ($pageno < $pagecount - 1) {
                $navi[] = '<a href="' . $script . '?cmd=read&amp;page=' . $r_page .
                        '&amp;p=' . $next . '" ' . $accesskey . '="8">8.Next</a>';
        }
 }
 
 $navi = join(' | ', $navi);
-$body = substr($body, $pageno * $max_size, $max_size);
+
+// ----
+// Output HTTP headers
+pkwk_headers_sent();
+if(TRUE) {
+       // Force Shift JIS encode for Japanese embedded browsers and devices
+       header('Content-Type: text/html; charset=Shift_JIS');
+       $title = mb_convert_encoding($title, 'SJIS', SOURCE_ENCODING);
+       $body  = mb_convert_encoding($body,  'SJIS', SOURCE_ENCODING);
+} else {
+       header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
+}
 
 // Output
 ?><html><head><title><?php