[php-blog-cvs] serendipity serendipity_admin_comments.inc.php,1.6,1.7

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17710

Modified Files:
	serendipity_admin_comments.inc.php 
Log Message:
Only append " ..." to summary if the summary is shorter than the entire comment.
Only show [HIDE] and [VIEW] links if the summary is shorter than the entire comment.


Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_admin_comments.inc.php	26 Jul 2004 17:05:46 -0000	1.6
+++ serendipity_admin_comments.inc.php	26 Jul 2004 17:12:22 -0000	1.7
@@ -4,7 +4,7 @@
 }
 
 $commentsPerPage = 15;
-
+$summaryLength = 200;
 
 /* We are asked to save the edited comment, and we are not in preview mode */
 if ( isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminAction'] == 'doEdit' && !isset($serendipity['POST']['preview']) ) {
@@ -153,6 +153,13 @@
         $rs['email'] = 'N/A';
     }
 
+    $fullBody = nl2br(strip_tags($rs['body']));
+    $summary = substr($fullBody, 0, $summaryLength);
+
+    if (strlen($fullBody) > strlen($summary) ) {
+        $summary .= ' ...';
+    }
+
     $class = 'serendipity_admin_list_item_' . (($i++ % 2 == 0 ) ? 'even' : 'uneven');
 ?>
 <tr>
@@ -171,15 +178,17 @@
                 <td align="right">(<?php echo $rs['ip'] ?>)</td>
             </tr>
             <tr>
-                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="4"><div id="<?php echo $rs['id'] ?>_summary"><?php echo nl2br(substr(strip_tags($rs['body']), 0, 200)) ?> ...</div><div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div></td>
+                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="4"><div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div><div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div></td>
             </tr>
         </table>
 <?php       if ($rs['status'] == 'pending') { ?>
             <strong>[<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>">Approve</a>]</strong> -
 <?php       } ?>
-        [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo DELETE ?></a>] -
-        [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo EDIT ?></a>] -
-        [<a href="#c<?php echo $rs['id'] ?>" onClick="toggle(<?php echo $rs['id'] ?>); return false;" id="<?php echo $rs['id'] ?>_link"><?php echo VIEW ?></a>]
+          [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo DELETE ?></a>]
+        - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo EDIT ?></a>]
+<?php if (strlen($fullBody) > strlen($summary) ) { ?>
+        - [<a href="#c<?php echo $rs['id'] ?>" onClick="toggle(<?php echo $rs['id'] ?>); return false;" id="<?php echo $rs['id'] ?>_link"><?php echo VIEW ?></a>]
+<?php } ?>
     </td>
 </tr>
 <?php } ?>