Changeset 1095

Timestamp:

05/11/07 16:00:59 (2 years ago)

Author:

ben

Message:

Some community fixes.

Files:

• devel/mod/community/lib.php (modified) (4 diffs)
• devel/mod/community/lib/communities_config.php (modified) (1 diff)
• devel/mod/community/lib/communities_edit.php (modified) (5 diffs)
• devel/mod/community/lib/communities_members.php (modified) (3 diffs)
• devel/mod/community/lib/communities_membership_requests.php (modified) (1 diff)
• devel/mod/community/lib/communities_moderator_of.php (modified) (3 diffs)
• devel/mod/community/lib/community_memberships.php (modified) (1 diff)
• devel/mod/community/lib/permissions_check.php (modified) (2 diffs)
• devel/mod/community/members.php (modified) (1 diff)

devel/mod/community/lib.php

@@ -26 +26 @@
-    global $CFG;
-    global $USER;
-    global $metatags;
-
-    require_once (dirname(__FILE__)."/default_template.php");
-    require_once (dirname(__FILE__)."/lib/communities_config.php");
-
-    $metatags .= "<link rel=\"stylesheet\" href=\"" . $CFG->wwwroot . "mod/community/css.css\" type=\"text/css\" media=\"screen\" />";
-
-    $page_owner = $profile_id;
-
@@ -38 +35 @@
-
-    $username= user_info('username', $page_owner);
+
+    if (isloggedin()) {
+        if (defined("context") && context == COMMUNITY_CONTEXT && context!="network" && $page_owner == $_SESSION['userid']) {
+
+            $PAGE->menu[] = array( 'name' => 'community',
+                                   'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/communities\" class=\"selected\" >" .__gettext("Your Communities").'</a></li>');
+            } else {
+                $PAGE->menu[] = array( 'name' => 'community',
+                                       'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/communities\" >" .__gettext("Your Communities").'</a></li>');
+            }
+    }
-
-    if ($usertype == "community") {
@@ -76 +84 @@
-                                         'html' => a_href("{$CFG->wwwroot}{$username}/community/requests",
-                                                           __gettext("View membership requests")));
+
+
+      /*-----------------------------------*
+           * O2O BEGIN modified by mac
+          /*-----------------------------------*/
+                  /**
+                 *it connects to invite to a person from a group by mac
+                 */
+                 /*
+                  $PAGE->menu_sub[] = array( 'name' => 'community:invite',
+                                         'html' => a_href( "{$CFG->wwwroot}_invite/", __gettext("Invite a friend")));
+                  */
+
+      /**---- I hypertie to contact to add a group like member  by mac --**/
+      /*
+          $PAGE->menu_sub[] = array( 'name' => 'community:addgroup',
+                                     'html' => a_href("{$CFG->wwwroot}_communities/addgroup.php?profile_id=$page_owner",
+                                                             __gettext("Invite a Community")));
+      */
+      /*-----------------------------------*
+           * O2O BEGIN modified by mac
+          /*-----------------------------------*/
-            }
-        }
@@ -131 +161 @@
-
-    // 'Communities' aspect to the little menus beneath peoples' icons
+        $function['community:infobox:menu'][] = $CFG->dirroot . "mod/community/lib/communities_info_menu.php";  
-        $function['users:infobox:menu:text'][] = $CFG->dirroot . "mod/community/lib/user_info_menu_text.php";
-

devel/mod/community/lib/communities_config.php

@@ -34 +34 @@
- * Type: boolean
- */
-
+
+
+
+
+
+
+
-?>

devel/mod/community/lib/communities_edit.php

@@ -10 +10 @@
-                               JOIN '.$CFG->prefix.'users u ON u.ident = f.friend
-                               WHERE f.owner = ? AND u.user_type = ?', array($user_id,'community'));
-
-END;
-    $i = 1;
-    if (!empty($result)) {
@@ -19 +17 @@
-            $friends_name = user_name($info->ident);
-            $info->icon = run("icons:get",$info->ident);
-users:infobox:menu",array($info->ident
+community:infobox:menu",array($info
-            $friends_icon = user_icon_html($info->ident,COMMUNITY_ICON_SIZE);
-            $link = $CFG->wwwroot.$info->username."/";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            }
-            $functions = implode("\n",array_map(create_function('$entry',"return \"<li>\$entry</li>\";"),$functions));
-            $_body[] = templates_draw(array(
-                                        'context' => 'community_member',
@@ -43 +30 @@
-                                        'icon' => $friends_icon,
-                                        'link' => $link,
-unctions
+riends_menu
-                                      )
-                        );
@@ -53 +40 @@
-          array_walk($member,create_function('&$body,$i',$separator_function));
-          $separator="<td $colspan>$memberlabel</td></tr><tr>";
-
+
+
-          if(!empty($owned)){
-__gettext("Owned Communities"
+sprintf(__gettext("Communities owned by %s"),user_info('name',$user_id)
-            $body.= implode("\n",$owned);
-            $separator="<td $colspan><hr>$memberlabel</td></tr><tr>";
@@ -69 +57 @@
-          $body = implode("\n",$member);
-        }
-
-    } else {
-        if ($user_id == $_SESSION['userid']) {

devel/mod/community/lib/communities_members.php

@@ -2 +2 @@
-global $CFG;
-// Given a user ID as a parameter, will display a list of communities
+
-
-if (isset($parameter[0])) {
@@ -9 +10 @@
-    $community_owner = user_info('owner',$community_id);
-
-
+
+
+
+
+
+
+
+
-                               JOIN '.$CFG->prefix.'users u ON u.ident = f.owner
-                               WHERE f.friend = ? AND u.user_type = ?',array($community_id,'person'));
+    }
-
-    $i = 1;
@@ -22 +31 @@
-            // $friends_menu = run("users:infobox:menu",array($info->ident));
-            $functions = array();
-
-
+
-                $msg= "onclick=\"return confirm('". __gettext("Are you sure you want to separate this user from the community?") ."')\"";
-                $functions[] = "<a href=\"".$CFG->wwwroot.$community_name."/community/separate/".$info->ident."\" $msg>".__gettext("Separate")."</a>";
-            }
- ($community_owner == $info->ident) 
-  
+($community_owner == $info->ident)
+
-            }
-            //@todo Add the funcionality to add admin users.
-
-            $functions = implode("\n",array_map(create_function('$entry',"return \"<li>\$entry</li>\";"),$functions));

devel/mod/community/lib/communities_membership_requests.php

@@ -1 +1 @@
-<?php
-global $CFG;
+
-$body = '';
-    // Lists membership requests for a community

devel/mod/community/lib/communities_moderator_of.php

@@ -16 +16 @@
-            $friends_name = user_name($info->ident);
-            $info->icon = run("icons:get",$info->ident);
-// $friends_menu = run("users:infobox:menu",array($info->ident
+$friends_menu = run("community:infobox:menu",array($info
-            $friends_icon = user_icon_html($info->ident,COMMUNITY_ICON_SIZE);
-            $link = $CFG->wwwroot.$info->username."/";
-            $functions = array();
-            $members = get_records("friends","friend",$info->ident);
-            $membercount = count($members);
-            $functions[] = "<a href=\"".$CFG->wwwroot.$info->username."/community/members\">".__gettext("Members")."&nbsp;(".$membercount.")</a>";
-            if ($info->owner == $_SESSION['userid']) {
-                $functions[] = "<a href=\"".$CFG->wwwroot.$info->username."/profile\">".__gettext("Administrate")."</a>";
-                $msg= "onclick=\"return confirm('". __gettext("Are you sure you want to delete this community?") ."')\"";
-                $functions[] = "<a href=\"".$CFG->wwwroot.$info->username."/community/delete\" $msg>".__gettext("Delete")."</a>";
-            }
-
-            $functions = implode("\n",array_map(create_function('$entry',"return \"<li>\$entry</li>\";"),$functions));
-            $body .= templates_draw(array(
-                                        'context' => 'community_member',
@@ -35 +25 @@
-                                        'icon' => $friends_icon,
-                                        'link' => $link,
-unctions
+riends_menu
-                                      )
-                        );
@@ -59 +49 @@
-
-}
-
-?>

devel/mod/community/lib/community_memberships.php

@@ -2 +2 @@
-global $CFG;
-global $page_owner;
-
+
-if ($page_owner != -1) {
-    if (user_type($page_owner) == "person" || user_type($page_owner) == "external") {

devel/mod/community/lib/permissions_check.php

@@ -45 +45 @@
-            if (record_exists('users','ident',$owner,'owner',$USER->ident,'user_type','community')) {
-                $run_result = true;
-/*
+
-            if (empty($run_result)) {
+                /*
-                if (count_records_sql('SELECT count(u.ident) FROM '.$CFG->prefix.'friends f
-                                                 JOIN '.$CFG->prefix.'users u ON u.ident = f.friend
@@ -53 +54 @@
-                    $run_result = true;
-                }
-
+
+
-            break;
-        case    "userdetails:change":

devel/mod/community/members.php

@@ -18 +18 @@
-
-    // Whose friends are we looking at?
-
+,$profile_id
-
-    // You must be logged on to view this!