Changeset 137

Timestamp:

08/17/10 13:50:36 (18 months ago)

Author:

gnum

Message:

Fixes #92, #93. Last changes and tune-ups for restoring posts and comments.

Location:

trunk

Files:

• actions/unhide_comment.php (modified) (2 diffs)
• actions/unhide_post.php (modified) (2 diffs)
• start.php (modified) (1 diff)
• views/default/edufeedr/educourse_hidden.php (modified) (2 diffs)

trunk/actions/unhide_comment.php

@@ -4 +4 @@
     gatekeeper();
     action_gatekeeper();
+    global $CONFIG;
 
         $id = (int) get_input('comment_id');
@@ -21 +22 @@
                         register_error(elgg_echo('edufeedr:error:comment_not_unhidden'));
                 }
-                forward($educourse->getURL());
+                forward($CONFIG->wwwroot . 'pg/edufeedr/view_hidden/' . $educourse->getGUID() . '/comments');
         }
 

trunk/actions/unhide_post.php

@@ -4 +4 @@
     gatekeeper();
     action_gatekeeper();
+    global $CONFIG;
 
         $id = (int) get_input('post_id');
@@ -21 +22 @@
                         register_error(elgg_echo('edufeedr:error:post_not_unhidden'));
                 }
-                forward($educourse->getURL());
+                forward($CONFIG->wwwroot . 'pg/edufeedr/view_hidden/' . $educourse->getGUID() . '/posts');
         }
 

trunk/start.php

@@ -168 +168 @@
         register_action('edufeedr/hide_post', false, $CONFIG->pluginspath . 'edufeedr/actions/hide_post.php');
         register_action('edufeedr/hide_comment', false, $CONFIG->pluginspath . 'edufeedr/actions/hide_comment.php');
-        register_action('edufeedr/unhide_post', false, $CONFIG->pluginspath . 'edufeedr/action/unhide_post.php');
-        register_action('edufeedr/unhide_comment', false, $CONFIG->pluginspath . 'edufeedr/action/unhide_comment.php');
+        register_action('edufeedr/unhide_post', false, $CONFIG->pluginspath . 'edufeedr/actions/unhide_post.php');
+        register_action('edufeedr/unhide_comment', false, $CONFIG->pluginspath . 'edufeedr/actions/unhide_comment.php');
 ?>

trunk/views/default/edufeedr/educourse_hidden.php

@@ -16 +16 @@
 
                         if ($posts && is_array($posts)) {
-                                $body .= '<h4 style="padding-top: 15px;font-weight:bold;"><a href="' . $post['link'] . '" target="_blank">' . $post['title'] . '</a></h4>';
-                                /*translation:%s by %s*/
-                                $body .= '<em>' . sprintf(elgg_echo('edufeedr:blog:by'), date('d.m.Y G:i', $post['date']), $post['author']) . '</em>';
-                                /*translation:restore*/
-                                $body .= '<a href="'.$vars['url'].'action/edufeedr/unhide_post?post_id='.$post['id'].'&educourse='.$vars['entity']->getGUID().'&__elgg_ts='.$ts.'&__elgg_token='.$token.'">' . elgg_echo('edufeedr:action:unhide') . '</a>';
+                                foreach ($posts as $post) {
+                                    $body .= '<h4 style="padding-top: 15px;font-weight:bold;"><a href="' . $post['link'] . '" target="_blank">' . $post['title'] . '</a></h4>';
+                                    /*translation:%s by %s*/
+                                    $body .= '<em>' . sprintf(elgg_echo('edufeedr:blog:by'), date('d.m.Y G:i', $post['date']), $post['author']) . '</em>';
+                                    /*translation:restore*/
+                                    $body .= '<a href="'.$vars['url'].'action/edufeedr/unhide_post?post_id='.$post['id'].'&educourse='.$vars['entity']->getGUID().'&__elgg_ts='.$ts.'&__elgg_token='.$token.'">' . elgg_echo('edufeedr:action:unhide') . '</a>';
+                                }
                         }
 
@@ -26 +28 @@
                         $comments = $es->getHiddenCommentsByCourse($vars['entity']->getGUID());
                         if ($comments && is_array($comments)) {
-                                $body .= '<div class="edufeedr_post_comment">';
-                                $body .= '<h4 style="padding-top:15px;font-weight:bold;"><a href="'.$comment['link'].'">'.$comment['title'].'</a></h4>';
-                                $body .= '<em>' . date('d.m.Y G:i', $comment['date']) . '</em>';
-                                /*translation:restore*/
-                                $body .= '<a href="'.$vars['url'].'action/edufeedr/unhide_comment?comment_id='.$comment['id'].'&educourse='.$vars['entity']->getGUID().'&__elgg_ts='.$ts.'&__elgg_token='.$token.'">' . elgg_echo('edufeedr:action:unhide') . '</a>';
-                                $body .= '</div>';
+                                foreach($comments as $comment) {
+                                    $body .= '<div class="edufeedr_post_comment">';
+                                    $body .= '<h4 style="padding-top:15px;font-weight:bold;"><a href="'.$comment['link'].'" target="_blank">'.$comment['title'].'</a></h4>';
+                                    $body .= '<em>' . date('d.m.Y G:i', $comment['date']) . '</em>';
+                                    /*translation:restore*/
+                                    $body .= '<a href="'.$vars['url'].'action/edufeedr/unhide_comment?comment_id='.$comment['id'].'&educourse='.$vars['entity']->getGUID().'&__elgg_ts='.$ts.'&__elgg_token='.$token.'">' . elgg_echo('edufeedr:action:unhide') . '</a>';
+                                    $body .= '</div>';
+                                }
 
                         }