Changeset 156

Timestamp:

09/01/10 16:47:43 (17 months ago)

Author:

gnum

Message:

References #100, done some changes, all small versions of posts and comments content get tags stripped, plus some more changes to nicer code

Location:

trunk/views/default/edufeedr

Files:

• educourse_blog.php (modified) (4 diffs)
• singles/educourse_comment.php (modified) (2 diffs)

trunk/views/default/edufeedr/educourse_blog.php

@@ -24 +24 @@
         if ($posts) {
             $phtml = '';
-                        $c = 1;
                         $post_date = "";
                         foreach ($posts as $post) {
@@ -36 +35 @@
                                 /*translation:%s by %s*/
                 $phtml .= "<em>".sprintf(elgg_echo('edufeedr:blog:by'), date("d.m.Y G:i",$post['date']), $post['author'])."</em>";
-                $phtml .= "<div>";
-                if (strlen($post['content'])>250) {
-                    $last_space = strrpos(substr($post['content'], 0, 250), ' ');
-                        $content_piece = substr($post['content'], 0, $last_space);
-                    $phtml .= '<div id="post_intro_'.$c.'">'.$content_piece.'...</div>';
-                                        /*translation:read more*/
-                                        $phtml .= '<a href="'.$vars['url'].'pg/edufeedr/view_post/'.$vars['entity']->getGUID().'/'.$post['id'].'">' . elgg_echo('edufeedr:read:more') . '</a>';
-                                        // Hide post
-                                        if ($vars['entity']->canEdit() && edufeedrCanEditEducourse($vars['entity'])) {
-                                                /*translation:hide*/
-                                                $phtml .= ' | <a href="'.$vars['url'].'action/edufeedr/hide_post?post_id='.$post['id'].'&educourse='.$vars['entity']->getGUID().'&__elgg_ts='.$ts.'&__elgg_token='.$token.'">' . elgg_echo('edufeedr:action:hide') . '</a>';
-                                        }
-                } else {
-                    $phtml .= $post['content'];
-                }
+                                $phtml .= "<div>";
+                                $phtml .= '<div class="edufeedr_post_content">';
+                                // Getting post content plaintext
+                                $post_content = strip_tags($post['content']);
+                if (strlen($post_content)>250) {
+                    $last_space = strrpos(substr($post_content, 0, 250), ' ');
+                        $content_piece = substr($post_content, 0, $last_space);
+                    $phtml .= $content_piece;
+                                } else {
+                    $phtml .= $post_content;
+                                }
+                                $phtml .= '</div>';// post content end
+                                // Actions
+                /*translation:read more*/
+                                $phtml .= '<a href="'.$vars['url'].'pg/edufeedr/view_post/'.$vars['entity']->getGUID().'/'.$post['id'].'">' . elgg_echo('edufeedr:read:more') . '</a>';
+                                // Hide post
+                                if ($vars['entity']->canEdit() && edufeedrCanEditEducourse($vars['entity'])) {
+                                        /*translation:hide*/
+                                        $phtml .= ' | <a href="'.$vars['url'].'action/edufeedr/hide_post?post_id='.$post['id'].'&educourse='.$vars['entity']->getGUID().'&__elgg_ts='.$ts.'&__elgg_token='.$token.'">' . elgg_echo('edufeedr:action:hide') . '</a>';
+                                }
+
                 $phtml .= "</div>";
-                $c++;
             }
             $body .= $phtml;
@@ -60 +64 @@
                 if ($comments) {
                         $chtml = '';
-                        $c = 1;
                         $comm_date = "";
                         foreach ($comments as $comment) {
@@ -69 +72 @@
                                 }
                                 $chtml .= elgg_view('edufeedr/singles/educourse_comment', array('educourse' => $vars['entity'], 'comment' => $comment, 'type' => 'coursefeed'));
-                                $c++;
             }
             $body .= $chtml;

trunk/views/default/edufeedr/singles/educourse_comment.php

@@ -33 +33 @@
                 // Content
                 $body .= '<div class="edufeedr_comment_content">';
+                // Getting comment content plaintext
+                $comment_content = strip_tags($vars['comment']['content']);
                 if ($type == 'coursefeed') {
-                        if (strlen($vars['comment']['content'])>200) {
-                                $last_space = strrpos(substr($vars['comment']['content'], 0, 200), ' ');
-                                $body .= substr($vars['comment']['content'], 0, $last_space);
+                        if (strlen($comment_content)>200) {
+                                $last_space = strrpos(substr($comment_content, 0, 200), ' ');
+                                $body .= substr($comment_content, 0, $last_space);
                         } else {
-                                $body .= $vars['comment']['content'];
+                                $body .= $comment_content;
                         }
                 } else if ($type == 'viewpost'){
@@ -48 +50 @@
                         if ($vars['comment']['post_id']) {
                                 /*translation:read more*/
-                                $body .= '<a href="'.$vars['url'].'pg/edufeedr/view_post/'.$vars['educourse']->getGUID().'/'.$comment['post_id'].'">' . elgg_echo('edufeedr:read:more') . '</a>';
+                                $body .= '<a href="'.$vars['url'].'pg/edufeedr/view_post/'.$vars['educourse']->getGUID().'/'.$vars['comment']['post_id'].'">' . elgg_echo('edufeedr:read:more') . '</a>';
                                 if ($can_edit) {
                                         $body .= ' | ';