From c4e7d7140dab78ada830d70aa38164af6702b8c5 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 11 Dec 2004 14:50:16 +0000
Subject: [PATCH] new edit_convert button, to get rid of old markup eventually

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4266 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/editpage.php                       | 30 ++++++++++++++++++++++----
 themes/default/templates/editpage.tmpl |  4 ++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/lib/editpage.php b/lib/editpage.php
index a281c49f0..7e55aa766 100644
--- a/lib/editpage.php
+++ b/lib/editpage.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: editpage.php,v 1.85 2004-12-06 19:49:56 rurban Exp $');
+rcs_id('$Id: editpage.php,v 1.86 2004-12-11 14:50:15 rurban Exp $');
 
 require_once('lib/Template.php');
 
@@ -35,7 +35,7 @@ class PageEditor
         
         $this->tokens = array();
         
-        $version = $request->getArg('version');
+       $version = $request->getArg('version');
         if ($version !== false) {
             $this->selected = $this->page->getRevision($version);
             $this->version = $version;
@@ -119,6 +119,8 @@ class PageEditor
             	     HTML::p(HTML::em(_("&version=-1 might help."))));
         }
 
+        if ($this->editaction == 'edit_convert')
+            $tokens['PREVIEW_CONTENT'] = $this->getConvertedPreview();
         if ($this->editaction == 'preview')
             $tokens['PREVIEW_CONTENT'] = $this->getPreview(); // FIXME: convert to _MESSAGE?
 
@@ -595,11 +597,19 @@ function undo_save() {
 	return new TransformedText($this->page, $this->_content, $this->meta);
     }
 
+    function getConvertedPreview () {
+        include_once('lib/PageType.php');
+        $this->_content = $this->getContent();
+        $this->meta['markup'] = 2.0;
+        $this->_content = ConvertOldMarkup($this->_content);
+	return new TransformedText($this->page, $this->_content, $this->meta);
+    }
+
     // possibly convert HTMLAREA content back to Wiki markup
     function getContent () {
         if (USE_HTMLAREA) {
             $xml_output = Edit_HtmlArea_ConvertAfter($this->_content);
-            $this->_content = join("",$xml_output->_content);
+            $this->_content = join("", $xml_output->_content);
             return $this->_content;
         } else {
             return $this->_content;
@@ -709,7 +719,7 @@ function undo_save() {
                                 'checked' => $this->meta['markup'] < 2.0,
                                 'id' => 'useOldMarkup',
                                 'onclick' => 'showOldMarkupRules(this.checked)'));
-
+        $el['OLD_MARKUP_CONVERT'] = ($this->meta['markup'] < 2.0) ? Button('submit:edit[edit_convert]', _("Convert"), 'wikiaction') : '';
         $el['LOCKED_CB']
             = HTML::input(array('type' => 'checkbox',
                                 'name' => 'edit[locked]',
@@ -766,6 +776,8 @@ function undo_save() {
             $this->editaction = 'preview';
         elseif (!empty($posted['save']))
             $this->editaction = 'save';
+        elseif (!empty($posted['edit_convert']))
+            $this->editaction = 'edit_convert';
         else
             $this->editaction = 'edit';
 
@@ -848,6 +860,8 @@ extends PageEditor
             $tokens['CONCURRENT_UPDATE_MESSAGE'] = $this->getConflictMessage();
         }
 
+        if ($this->editaction == 'edit_convert')
+            $tokens['PREVIEW_CONTENT'] = $this->getConvertedPreview();
         if ($this->editaction == 'preview')
             $tokens['PREVIEW_CONTENT'] = $this->getPreview(); // FIXME: convert to _MESSAGE?
 
@@ -890,6 +904,14 @@ extends PageEditor
 
 /**
  $Log: not supported by cvs2svn $
+ Revision 1.85  2004/12/06 19:49:56  rurban
+ enable action=remove which is undoable and seeable in RecentChanges: ADODB ony for now.
+ renamed delete_page to purge_page.
+ enable action=edit&version=-1 to force creation of a new version.
+ added BABYCART_PATH config
+ fixed magiqc in adodb.inc.php
+ and some more docs
+
  Revision 1.84  2004/12/04 12:58:26  rurban
  enable babycart Blog::SpamAssassin module on ENABLE_SPAMASSASSIN=true
  (currently only for php >= 4.3.0)
diff --git a/themes/default/templates/editpage.tmpl b/themes/default/templates/editpage.tmpl
index 2cca38146..3f868ad3c 100644
--- a/themes/default/templates/editpage.tmpl
+++ b/themes/default/templates/editpage.tmpl
@@ -1,5 +1,5 @@
 <!-- -*-html-*- -->
-<!-- $Id: editpage.tmpl,v 1.50 2004-12-04 11:14:18 rurban Exp $ -->
+<!-- $Id: editpage.tmpl,v 1.51 2004-12-11 14:50:16 rurban Exp $ -->
 <?php
 $WidthI = HTML::input(array('type' => 'text',
                             'size' => 3,
@@ -69,7 +69,7 @@ $s = $WikiTheme->getButtonSeparator();
 <tr valign="middle">
   <td> 
     <?=$MINOR_EDIT_CB ?> <?=_("This is a minor change.")?><br />
-    <?=$OLD_MARKUP_CB?>  <?=_("Use old markup")?>
+    <?=$OLD_MARKUP_CB?>  <?=_("Use old markup")?> <?=$OLD_MARKUP_CONVERT?>
   </td>
   <td align="center">
     <?= $PREVIEW_B ?>
-- 
2.45.0