Changeset 530

Timestamp:

09/06/06 22:53:51 (2 years ago)

Author:

ben

Message:

Notifications - user comments etc - are now sent to a 'messages' database, which is primed for internal user-to-user messaging. If the emailnotifications flag is set, notifications still get emailed. TODO: 'view' interface, as part of recent activity.

Files:

• devel/lib/db/mysql.php (modified) (1 diff)
• devel/lib/db/mysql.sql (modified) (1 diff)
• devel/lib/db/postgres7.php (modified) (1 diff)
• devel/lib/db/postgres7.sql (modified) (1 diff)
• devel/lib/userlib.php (modified) (1 diff)
• devel/units/communities/communities_actions.php (modified) (2 diffs)
• devel/units/friends/friends_actions.php (modified) (5 diffs)
• devel/units/weblogs/weblogs_actions.php (modified) (1 diff)
• devel/version.php (modified) (1 diff)

devel/lib/db/mysql.php

@@ -361 +361 @@
-    
-    if ($oldversion < 2006090600) {
-
+
+
+
+
+
-    }
-    

devel/lib/db/mysql.sql

@@ -501 +501 @@
-  KEY `tagline` (`tagline`)
-) ;
+
+
+-- 
+-- Table structure for table `messages`
+-- 
+
+CREATE TABLE `prefix_messages` (
+  `ident` int(11) NOT NULL auto_increment,
+  `title` text NOT NULL default '',
+  `body` text NOT NULL default '',
+  `from` int(11) NOT NULL,
+  `to` int(11) NOT NULL,
+  `posted` int(11) NOT NULL,
+  `status` enum('read','unread') NOT NULL default 'unread',
+  PRIMARY KEY  (`ident`),
+  KEY `from` (`from`,`to`,`posted`)
+) TYPE=MyISAM ;

devel/lib/db/postgres7.php

@@ -323 +323 @@
-    
-    if ($oldversion < 2006090600) {
-
+
+
+
+
+
+
-    }
-    

devel/lib/db/postgres7.sql

@@ -358 +358 @@
-CREATE INDEX prefix_feeds_siteurl_idx ON prefix_feeds (siteurl);
-CREATE INDEX prefix_feeds_tagline_idx ON prefix_feeds (tagline);
+
+
+-- 
+-- Table structure for table `messages`
+-- 
+
+CREATE TABLE `prefix_messages` (
+  `ident` SERIAL PRIMARY KEY,
+  `title` text NOT NULL default '',
+  `body` text NOT NULL default '',
+  `from` int(11) NOT NULL default -1,
+  `to` int(11) NOT NULL default -1,
+  `posted` int(11) NOT NULL default 0,
+  `status` enum('read','unread') NOT NULL default 'unread',
+);
+
+CREATE INDEX prefix_messages_to_idx ON prefix_messages (from,to);

devel/lib/userlib.php

@@ -139 +139 @@
-        }
-    }
+
+// NOTIFICATIONS AND MESSAGING /////////////////////////////////////////////////
+
+    // Send a message to a user
+    
+    function message_user($to, $from, $title, $message) {
+        
+        global $messages;
+        
+        $notifications = user_flag_get("emailnotifications",$to);
+        if ($notifications) {
+            $from = new StdClass;
+            $from->email = $CFG->noreplyaddress;
+            $from->name = $CFG->sitename;
+            email_to_user($u,$from,$title,$message);
+        }
+        
+        $m = new StdClass;
+        $m->title = $title;
+        $m->body = $message;
+        $m->from_id = $from;
+        $m->to_id = $to;
+        $m->posted = time();
+        $m->status = 'unread';
+        if (!insert_record('messages',$m)) {
+            $messages[] = gettext("Failed to send message. An unknown error occurred.");
+        }
+        
+    }
+
+    // Send a notification to a user, both using the notifications table and
+    // - potentially - email, depending on a user's preferences
+    
+    function notify_user($user_id, $title, $message) {
+        
+        message_user($user_id, -1, $title, $message);
+        
+    }
-    
-// STATISTICS //////////////////////////////////////////////////////////////////

devel/units/communities/communities_actions.php

@@ -52 +52 @@
-     case "friend":
-         if (!empty($friend_id) && logged_on) {
-run("users:type:get", 
+user_info("user_type",
-                 if ($friend = get_record('users','ident',$friend_id)) {
-                     $owner = get_record('users','ident',$friend->owner);
@@ -58 +58 @@
-                         $messages[] = sprintf(gettext("You joined %s."), stripslashes($friend->name));
-                         if (run("users:flags:get",array("emailnotifications",$owner->ident))) {
-email_message
+message_body
-                                                                     "%s\n\nTo view all community members, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."),
-
-
+
+
+
-                         }
-                     } else if ($friend->moderation == "yes") {
-                         $messages[] = sprintf(gettext("Membership of %s needs to be approved. Your request has been added to the list."), stripslashes($friend->name));
-                         if (run("users:flags:get",array("emailnotifications",$owner->ident))) {
-email_message
+message_body
-                                                                     "%s\n\nTo view all membership requests and approve or deny this user, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."),
-
-
+
+
+
-                         }
-                     } else if ($friend->moderation == "priv") {

devel/units/friends/friends_actions.php

@@ -21 +21 @@
-                if ($friend->moderation == 'no') {
-                    if (insert_record('friends',$f)) {
-run("users:type:get", 
+user_info("user_type",
-                            $messages[] = sprintf(gettext("%s was added to your friends list."),$friend->name);
-                            if (run("users:flags:get",array("emailnotifications",$friend_id))) {
-                                $u = get_record('users','ident',$friend_id);
-email_message
+message_body
-                                                                 "%s\n\nTo view all your friends, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."),
-
-
+
+
+
-                            }
-                        }
-                    } else {
-run("users:type:get", 
+user_info("user_type",
-                            $messages[] = sprintf(gettext("%s couldn't be added to your friends list."),$friend->name);
-                        }
@@ -38 +39 @@
-                } else if ($friend->moderation == 'yes') {
-                    if (insert_record('friends_requests',$f)) {
-run("users:type:get", 
+user_info("user_type",
-                            $messages[] = sprintf(gettext("%s has elected to moderate friendship requests. Your request has been added to their moderation queue."),$friend->name);
-                            if (run("users:flags:get",array("emailnotifications",$friend_id))) {
-                                $u = get_record('users','ident',$friend_id);
-email_message
+message_body
-                                                                 "%s\n\nTo view all your friends requests and approve or deny this user, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."),
-
-
+
+
+
-                            }
-                        }
-                    } else {
-run("users:type:get", 
+user_info("user_type",
-                            $messages[] = sprintf(gettext("%s has elected to moderate friendship requests, but your friend request couldn't be added to their moderation queue."),$friend->name);
-                        }
-                    }
-run("users:type:get", 
+user_info("user_type",
-                    $messages[] = sprintf(gettext("%s has decided not to allow any new friendship requests at this time. Your friendship request has been declined."),$friend->name);
-                }
@@ -63 +65 @@
-         if (!empty($friend) && logged_on) {
-             if (delete_records('friends','owner',$USER->ident,'friend',$friend_id)) {
-run("users:type:get", 
+user_info("user_type",
-                     $messages[] = $friend->name . gettext(" was removed from your friends.");
-                 }
-             } else {
-run("users:type:get", 
+user_info("user_type",
-                     $messages[] = $friend->name . gettext(" couldn't be removed from your friends.");
-                 }
@@ -87 +89 @@
-                         delete_records('friends_requests','ident',$request_id);
-                         $messages[] = sprintf(gettext("You approved the friendship request. %s now lists you as a friend."),stripslashes($request->name));
+                         $message_body = sprintf(gettext("%s has approved your friendship request!\n\nTo visit this user's profile, click on the following link:\n\n\t".
+                                                          "%s\n\nTo view all your friends, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."),
+                                                          user_info("name",$request->friend), $CFG->wwwroot . user_info("username",$request->friend) . "/", $CFG->wwwroot . user_info("username",$request->owner) . "/friends/",$CFG->sitename);
+                         $title = sprintf(gettext("%s friend request approved!"), $CFG->sitename);
+                         notify_user($request->owner,$title,$message_body);
-                     } else {
-                         $messages[] = gettext("An error occurred: couldn't add you as a friend");
@@ -109 +116 @@
-                     delete_records('friends_requests','ident',$request_id);
-                     $messages[] = sprintf(gettext("You declined the friendship request. %s does not list you as a friend."),stripslashes($request->name));
+                     $message_body = sprintf(gettext("%s has denied your friendship request.\n\nTo visit this user's profile, click on the following link:\n\n\t".
+                                                          "%s\n\nTo view all your existing friends, click here:\n\n\t%s\n\nRegards,\n\nThe %s team."),
+                                                          user_info("name",$request->friend), $CFG->wwwroot . user_info("username",$request->friend) . "/", $CFG->wwwroot . user_info("username",$request->owner) . "/friends/",$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 friendship request.");

devel/units/weblogs/weblogs_actions.php

@@ -131 +131 @@
-                        if (run("users:flags:get",array("emailreplies",$post->owner))) {
-                            if ($email = get_record('users','ident',$post->owner)) {
-                                $username = $email->username;
-                                $message = gettext(sprintf("You have received a comment from %s on your blog post '%s'. It reads as follows:", $comment->postedname, stripslashes($post->title)));
-                                $message .= "\n\n\n" . stripslashes($comment->body) . "\n\n\n";
-                                $message .= gettext(sprintf("To reply and see other comments on this blog post, click here: %s", url . $username . "/weblog/" . $post->ident . ".html"));
-                                $message = wordwrap($message);
-
-
-
-
+
-                            }
-                        }

devel/version.php

@@ -7 +7 @@
-// whether upgrades should be performed (see lib/db/*.php)
-
-0
+1
-                           //         X  = Elgg Point release (0,1,2...)
-                           //          Y = Interim incrementer