[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.7,1.8 serendipity_functions.inc.php,1.144,1.145 serendipity_lang_de.inc.php,1.26,1.27 serendipity_lang_en.inc.php,1.36,1.37

[<jhe...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv10561

Modified Files:
	serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php 
Log Message:
Added ability to preview entries before saving them - no db structure update needed. Please test.


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_entries.inc.php	30 Aug 2003 09:55:09 -0000	1.7
+++ serendipity_admin_entries.inc.php	30 Aug 2003 16:57:55 -0000	1.8
@@ -128,23 +128,45 @@
                    'categoryid' => $serendipity['POST']['categoryid'],
                    'isdraft'    => $serendipity['POST']['isdraft']
                  );
-
-        $res = serendipity_updertEntry($entry);
-
-        if (is_string($res)) {
+                 
+        // Save the entry, or just display a preview
+        if ($serendipity['POST']['preview'] != 'true') {
+            $res = serendipity_updertEntry($entry);
+            if (is_string($res)) {
+                serendipity_printEntryForm(
+                  '?',
+                  array(
+                    'serendipity[action]'      => 'admin',
+                    'serendipity[adminModule]' => 'entries',
+                    'serendipity[adminAction]' => 'save'
+                  ),
+                  $entry,
+                  ERROR . ': <b>' . $res . '</b>');
+            } else {
+                echo ENTRY_SAVED;
+            }
+        }
+        
+        // Only display the preview
+        else {
+            $entry['timestamp'] = time();
+            $entry['trackbacks'] = 0;
+            $entry['comments']   = 0;
+            echo "<h3>".PREVIEW."</h3>";
+            echo '<div style="border:1px solid #000000; padding: 15px;">';
+            serendipity_printEntries(array($entry));
+            echo '</div>';
             serendipity_printEntryForm(
-              '?',
-              array(
+                '?',
+                array(
                 'serendipity[action]'      => 'admin',
                 'serendipity[adminModule]' => 'entries',
-                'serendipity[adminAction]' => 'save'
-              ),
-              $entry,
-              ERROR . ': <b>' . $res . '</b>');
-        } else {
-            echo ENTRY_SAVED;
+                'serendipity[adminAction]' => 'save',
+                'serendipity[timestamp]'   => $entry['timestamp']
+                ),
+            $entry
+        );
         }
-
         break;
 
     case 'editSelect':

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- serendipity_functions.inc.php	30 Aug 2003 16:17:46 -0000	1.144
+++ serendipity_functions.inc.php	30 Aug 2003 16:57:55 -0000	1.145
@@ -1795,6 +1795,7 @@
     }
     $hidden .= '        <input type="hidden" name="serendipity[id]" value="' . $entry['id'] . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . $entry['timestamp'] . '" />' . $n;
+    $hidden .= '        <input type="hidden" name="serendipity[preview]" value="false" />';
 ?>
         <span style="color: #FF0000;"><?php echo $errMsg; ?></span>
         <form action="<?php echo $targetURL; ?>" method="post" <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px">
@@ -1859,6 +1860,7 @@
 
             <tr>
                 <td colspan="2" align="right">
+                    <input type="button" value="- <?php echo PREVIEW?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();"/>
                     <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
                 </td>
             </tr>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_de.inc.php	30 Aug 2003 09:55:09 -0000	1.26
+++ serendipity_lang_de.inc.php	30 Aug 2003 16:57:55 -0000	1.27
@@ -270,6 +270,7 @@
 define('TYPE', 'Typ');
 define('DRAFT', 'Entwurf');
 define('PUBLISH', 'Ver&ouml;ffentlichung');
+define('PREVIEW', 'Vorschau');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_en.inc.php	30 Aug 2003 09:55:09 -0000	1.36
+++ serendipity_lang_en.inc.php	30 Aug 2003 16:57:55 -0000	1.37
@@ -270,6 +270,7 @@
 define('TYPE', 'Type');
 define('DRAFT', 'Draft');
 define('PUBLISH', 'Publish');
+define('PREVIEW', 'Preview');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */