reviewed groups plugin and added todo's

git-svn-id: http://code.elgg.org/elgg/trunk@8591 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/groups/views/default/forms/groups/search.php b/mod/groups/views/default/forms/groups/search.php
index 8495fc18670ada248e8b9ac7114ed479afce632e..ddf639b74673e06ff2f26b1f86d0d8559dd0d696 100644 (file)
--- a/mod/groups/views/default/forms/groups/search.php
+++ b/mod/groups/views/default/forms/groups/search.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * Group tag-based search form body
+ */
 
 $tag_string = elgg_echo('groups:search:tags');
 

diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php
index 87fbaa1826ce09b3de97b7dec62483bb68e06103..2434bd14fc9cf4709bb0710f03d6a366b235beb3 100644 (file)
--- a/mod/groups/views/default/groups/edit.php
+++ b/mod/groups/views/default/groups/edit.php
@@ -1,6 +1,8 @@
 <?php
 /**
- * Edit/create a group
+ * Edit/create a group wrapper
+ *
+ * @uses $vars['entity'] ElggGroup object
  */
 
 $entity = elgg_extract('entity', $vars, null);

diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index 6ba56628e499521b68f72db2d4c5e801cfeecbf3..ef99a21a8f445e39ac93a76b35fb9e6e75e3b4d1 100644 (file)
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * All groups navigation menu
+ * All groups listing page navigation
+ *
+ * @todo should use navigation tab view
  */
 
 $group_count = (int)elgg_get_entities(array('types' => 'group', 'count' => true));
 
 $selected = elgg_extract('selected', $vars);
        
-       //url
-       $url = elgg_get_site_url() . "pg/groups/all/";
+$url = elgg_get_site_url() . "pg/groups/all/";
 
 ?>
 <div class="elgg-tabs mtm">

diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
index 1c7e6daa2afde0ed66cdd1e694ab8f0db7d7fba9..78eae9cec25d20c3b0a40552b291193b6a610b6a 100644 (file)
--- a/mod/groups/views/default/groups/profile/activity_module.php
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -2,11 +2,11 @@
 /**
  * Groups latest activity
  *
+ * @todo add people joining group to activity
+ * 
  * @package Groups
  */
 
-global $CONFIG;
-
 if ($vars['entity']->activity_enable == 'no') {
        return true;
 }
@@ -16,7 +16,6 @@ if (!$group) {
        return true;
 }
 
-
 $all_link = elgg_view('output/url', array(
        'href' => "pg/groups/activity/$group->guid",
        'text' => elgg_echo('link:view:all'),
@@ -27,10 +26,11 @@ $header .= '<h3>' . elgg_echo('groups:activity') . '</h3>';
 
 
 elgg_push_context('widgets');
+$db_prefix = elgg_get_config('dbprefix');
 $content = elgg_list_river(array(
        'limit' => 4,
        'pagination' => false,
-       'joins' => array("join {$CONFIG->dbprefix}entities e1 on e1.guid = rv.object_guid"),
+       'joins' => array("join {$db_prefix}entities e1 on e1.guid = rv.object_guid"),
        'wheres' => array("(e1.container_guid = $group->guid)"),
 ));
 elgg_pop_context();
@@ -40,42 +40,3 @@ if (!$content) {
 }
 
 echo elgg_view_module('info', '', $content, array('header' => $header));
-
-return true;
-?>
-<span class="group_widget_link">
-<?php 
-       echo elgg_view('output/url', array(
-               'href' => "pg/groups/activity/" . elgg_get_page_owner_guid(),
-               'text' => elgg_echo('link:view:all'),
-       ));
-?>
-</span>
-<h3><?php echo elgg_echo("activity"); ?></h3>
-<?php
-       $owner = elgg_get_page_owner_entity();
-       $group_guid = $owner->guid;
-       $limit = 5;
-
-       $offset = (int) get_input('offset', 0);
-
-       // Sanitise variables -- future proof in case they get sourced elsewhere
-       $limit = (int) $limit;
-       $offset = (int) $offset;
-       $group_guid = (int) $group_guid;
-
-       //@todo Holy cow, this really needs to be a function!
-       $sql = "SELECT {$CONFIG->dbprefix}river.id, {$CONFIG->dbprefix}river.type, {$CONFIG->dbprefix}river.subtype, {$CONFIG->dbprefix}river.action_type, {$CONFIG->dbprefix}river.access_id, {$CONFIG->dbprefix}river.view, {$CONFIG->dbprefix}river.subject_guid, {$CONFIG->dbprefix}river.object_guid, {$CONFIG->dbprefix}river.posted FROM {$CONFIG->dbprefix}river INNER JOIN {$CONFIG->dbprefix}entities AS entities1 ON {$CONFIG->dbprefix}river.object_guid = entities1.guid INNER JOIN {$CONFIG->dbprefix}entities AS entities2 ON entities1.container_guid = entities2.guid WHERE entities2.guid = $group_guid OR {$CONFIG->dbprefix}river.object_guid = $group_guid ORDER BY posted DESC limit {$offset},{$limit}";
-
-       $items = get_data($sql);
-
-       if (count($items) > 0) {
-               $river_items = elgg_view('river/item/list',array(
-                                                               'limit' => $limit,
-                                                               'offset' => $offset,
-                                                               'items' => $items
-                                                               ));
-       }
-       echo $river_items;
-
-?>

diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
index 0ae2bef6350d411a1f63deb6edca7b4dfa672c76..df2314689fa652df8c80fcb22634c9d04207584d 100644 (file)
--- a/mod/groups/views/default/groups/side_menu.php
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -1,3 +1,8 @@
+<?php
+/**
+ * @todo move into start.php using register menu item function
+ */
+?>
 <ul class="submenu page_navigation">
 <?php
        if(elgg_is_logged_in()){

diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 669d2c6bd837faf80efb234e5c016762c09cf500..5f93022e7e84b15b3012808aae30f8a05b659f08 100644 (file)
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -2,6 +2,8 @@
 /**
  * Group members sidebar
  *
+ * @todo clean up html
+ *
  * @package ElggGroups
  */
 

diff --git a/mod/groups/views/default/river/annotation/group_topic_post/reply.php b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
index f0b7d03b8b76e42f15915ea8f2753c001d230496..1999c8dd92dbf176e3616f59b977ae6d59e7c64e 100644 (file)
--- a/mod/groups/views/default/river/annotation/group_topic_post/reply.php
+++ b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
@@ -25,4 +25,3 @@ if ($reply) {
        echo $excerpt;
        echo '</div>';
 }
-

diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 5123964c3370dc2b8f18010deb50cd8e7854f51f..06082664958685f46cf7f8205330958eea7446b9 100644 (file)
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -11,7 +11,6 @@ $params = array(
 );
 $link = elgg_view('output/url', $params);
 
-
 echo elgg_echo('groups:river:join');
 
 echo " $link";

diff --git a/mod/groups/views/default/settings/groups/edit.php b/mod/groups/views/default/settings/groups/edit.php
index 1cf6be466cc1122e68b814d89a870e235a801e7f..7197dcb379dfb3841ed75daf3a56dc24634c54f9 100644 (file)
--- a/mod/groups/views/default/settings/groups/edit.php
+++ b/mod/groups/views/default/settings/groups/edit.php
@@ -8,7 +8,7 @@ if (!isset($vars['entity']->hidden_groups)) {
        $vars['entity']->hidden_groups = 'no';
 }
 
-echo '<p>';
+echo '<div>';
 echo elgg_echo('groups:allowhiddengroups');
 echo ' ';
 echo elgg_view('input/dropdown', array(
@@ -19,4 +19,4 @@ echo elgg_view('input/dropdown', array(
        ),
        'value' => $vars['entity']->hidden_groups,
 ));
-echo '</p>';
+echo '</div>';