Changeset 1390

Timestamp:

12/06/07 13:51:52 (10 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Addresses #160, community owners now have an option to search and invite users to a community

Files:

• devel/htaccess-dist (modified) (1 diff)
• devel/mod/community/invite.php (added)
• devel/mod/community/lib.php (modified) (4 diffs)
• devel/mod/community/lib/communities_actions.php (modified) (2 diffs)
• devel/mod/community/lib/community_membership_invitations.php (added)
• devel/mod/friend/lib/user_friendship_requests.php (modified) (2 diffs)

devel/htaccess-dist

@@ -124 +124 @@
-RewriteRule ^([A-Za-z0-9]+)\/community\/separate\/([0-9]+)$ mod/community/members.php?profile_name=$1&friend_id=$2&action=separate
-RewriteRule ^community\/([0-9]+)\/?$ mod/communities/community.php?community_id=$1
-
+
+
-
-# Files

devel/mod/community/lib.php

@@ -85 +85 @@
-                                         'html' => a_href("{$CFG->wwwroot}{$username}/community/requests",
-                                                           __gettext("View membership requests")));
-
+
+
+
+
+
-        }
-        
@@ -105 +109 @@
-            }
-        }
-        
-    } else if ($usertype == "person") {
-
@@ -138 +141 @@
-                                  'user_type' => 'community');
-
+    // Add membership requests to the personal network page
+    if (defined("context") && context == "network") {
+          $PAGE->menu_sub[] = array( 'name' => 'membership:invites',
+                                   'html' => a_href( "{$CFG->wwwroot}{$username}/communities/invitations",
+                                                      __gettext("Membership invitations")));
+    }
-}
-
@@ -210 +219 @@
-                river_register_friendlyname_hook('community::community', 'community_get_friendly_name');
-        }
-        
-}
-

devel/mod/community/lib/communities_actions.php

@@ -12 +12 @@
-
-if (isloggedin()) {
-
-    switch($action) {
-
@@ -141 +140 @@
-             break;
-
+         case "community:approve:invitation":
+         $request_id = optional_param('request_id',0,PARAM_INT);
+         if (!empty($request_id) && logged_on && user_type($page_owner) == "person") { 
+             if ($request = get_record_sql('SELECT u.name, fr.owner, fr.friend FROM '.$CFG->prefix.'friends_requests fr
+                                    LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner 
+                                    WHERE fr.ident = ?',array($request_id))) {
+                 if (run("permissions:check",array("userdetails:change", $page_owner))) {
+                     $f = new StdClass;
+                     $f->owner = $request->owner;
+                     $f->friend = $request->friend;
+                     if (insert_record('friends',$f)) {
+                         delete_records('friends_requests','ident',$request_id);
+                         $messages[] = sprintf(__gettext("You accepted the community invitation. You are now a member of the community %s."),stripslashes($request->name));
+                         $message_body = sprintf(__gettext("%s has approved your community invitation!\n\nRegards,\n\nThe %s team."),user_name($request->friend), $CFG->sitename);
+                         $title = __gettext("Community invitation accepted!");
+                         notify_user($request->owner,$title,$message_body);
+                     } else {
+                         $messages[] = __gettext("An error occurred: couldn't add you as a community member");
+                     }
+                 } else {
+                     $messages[] = __gettext("Error: you do not have authority to accept this membership invitation.");
+                 }
+             } else {
+                 $messages[] = __gettext("An error occurred: the invitation could not be found.");
+             }
+             
+         }
+         break;
+     case "community:decline:invitation":
+         $request_id = optional_param('request_id',0,PARAM_INT);
+         if (!empty($request_id) && logged_on && user_type($page_owner) == "person") {
+             if ($request = get_record_sql('SELECT u.name, fr.owner, fr.friend FROM '.$CFG->prefix.'friends_requests fr
+                                    LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner 
+                                    WHERE fr.ident = ?',array($request_id))) {
+                 if (run("permissions:check",array("userdetails:change", $page_owner))) {
+                     delete_records('friends_requests','ident',$request_id);
+                     $messages[] = sprintf(__gettext("You declined the community invitation. You are not a member of community %s."),stripslashes($request->name));
+                     $message_body = sprintf(__gettext("%s has denied your community invitation.\n\nRegards,\n\nThe %s team."),user_name($request->friend), $CFG->sitename);
+                     $title = sprintf(__gettext("%s friend request denied"), $CFG->sitename);
+                     notify_user($request->owner,$title,$message_body);
+                 } else {
+                     $messages[] = __gettext("Error: you do not have authority to modify this membership invitation.");
+                 }
+             } else {
+                 $messages[] = __gettext("An error occurred: the invitation could not be found.");
+             }
+             
+         }
+         break;
-    }
-

devel/mod/friend/lib/user_friendship_requests.php

@@ -13 +13 @@
-            if ($pending_requests = get_records_sql('SELECT fr.ident AS request_id,u.*
-                                                     FROM '.$CFG->prefix.'friends_requests fr LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner
-
+AND u.user_type = \'person\' 
-                $body = "<p>" . __gettext("The following users would like to add you as a friend. They need your approval to do this (to change this setting, visit the 'account settings' page).") . "</p>";
-
@@ -51 +51 @@
-                $body = "<p>" . __gettext("You have no pending friendship requests.") . "</p>";
-            }
-
-
+
+
+
+
+
+
+
-
-        }