Changeset 1550

Timestamp:

02/11/08 02:51:42 (6 months ago)

Author:

dramirez

Message:

Remove all the code related to the river plugin to make it a selfcontained functionality

Files:

• devel/mod/blog/lib.php (modified) (2 diffs)
• devel/mod/commentwall/do_action.php (modified) (1 diff)
• devel/mod/commentwall/lib.php (modified) (2 diffs)
• devel/mod/community/lib.php (modified) (1 diff)
• devel/mod/community/lib/communities_actions.php (modified) (1 diff)
• devel/mod/community/lib/community_member_add.php (modified) (4 diffs)
• devel/mod/community/lib/community_member_remove.php (modified) (3 diffs)
• devel/mod/file/lib.php (modified) (2 diffs)
• devel/mod/friend/lib/friends_actions.php (modified) (4 diffs)
• devel/mod/template/templates/Default_Template/frontpage_loggedin (modified) (1 diff)

devel/mod/blog/lib.php

@@ -250 +250 @@
-  
-  //$CFG->weblog_extensions['weblog']= array ();
-
-        // Register file river hook (if there)
-        if (function_exists('river_save_event'))
-        {
-                listen_for_event('weblog_post','publish', 'blog_river_hook');
-                listen_for_event('weblog_post','delete', 'blog_river_hook');
-
-                river_register_friendlyname_hook('weblog_post::post', 'blog_get_friendly_name');
-        }
-}
-
-function blog_get_friendly_name($object_type, $object_id)
-{
-        global $CFG;
-
-        if ($object_type == 'weblog_post::post')
-        {
-                $record = get_record_sql("SELECT * from {$CFG->prefix}weblog_posts where ident=$object_id");
-
-                if ($record)
-                {
-                        $blog = user_info("username", $record->weblog);
-                        $url = river_get_userurl($record->weblog);
-                        
-                        return sprintf(__gettext("a post in <a href=\"$url\">%s</a>'s weblog"), $blog);
-                }
-        }
-
-        return "";
-}
-
-function blog_river_hook( $object_type, $event, $object)
-{
-        global $CFG;
-
-        $userid = ($_SESSION['userid'] == "" ? -1 : $_SESSION['userid']);
-        $object_id = $object->ident;
-        $object_owner = $object->owner;
-        $title = trim($object->title);
-        $weblogid = $object->weblog;
-
-        $username = user_info("username", $userid);
-        $weblogname = "<a href=\"" . river_get_userurl($weblogid) . "\">". user_info("username", $weblogid) . "</a>'s";
-        if ($userid == $weblogid) $weblogname = __gettext("their");
-
-        $entryurl = $CFG->wwwroot . $username . "/weblog/" . $object->ident . ".html";
-
-        $titletxt = ""; 
-        if ($title!="")
-                $titletxt = sprintf( __gettext(" called '%s'"), $title);
-
-        if ($username == false) $username = __gettext("Anonymous user");
-        
-        if ($event == "publish")
-                river_save_event($userid, $object_id, $object_owner, $object_type, "<a href=\"" .  river_get_userurl($userid) . "\">$username</a> left a <a href=\"$entryurl\">post$titletxt</a> in $weblogname blog.",$object->access);
-
-        return $object;
-}
-
@@ -712 +655 @@
-    return isset($type) ? $type : $default;
-}
+
+/**
+ * Returns the extension context given a weblog_post object
+ *
+ * @param object $object A weblog_post object
+ * @return string The object extension context
+ */
+function blog_get_context($object){
+  global $CFG;
+  if(empty($object->extra_value)) {
+    return "weblog";
+  }
+  
+  if(!empty($CFG->weblog_extensions)){
+    foreach($CFG->weblog_extensions as $extension => $config){
+      if(array_key_exists('values',$config) && in_array($object->extra_value,$config['values'])){
+        return strtolower($extension);
+      }
+    }
+  }  
+}
+
+/**
+ * Returns the context type given an weblog_post object
+ *
+ * @param object $object Weblog_post object
+ * @return string The object's extension context type
+ */
+function blog_get_context_type($object){
+  global $CFG;
+  if(empty($object->extra_value)) {
+    return __gettext("Blog post");
+  }
+  
+  if(!empty($CFG->weblog_extensions)){
+    $context = blog_get_context($object);
+    if(array_key_exists('type',$CFG->weblog_extensions[$context])){
+      return $CFG->weblog_extensions[$context]['type'];
+    }
+  }  
+}
+
-?>

devel/mod/commentwall/do_action.php

@@ -36 +36 @@
-                        if ($displaymode=="xml") 
-                                $messages[] = __gettext(" Click here to see.");
-
-                        // Hook for the river plugin (if installed)
-                        if (function_exists('river_save_event'))
-                        {
-                                $verb = __gettext("left");
-                                if ($reply!="")
-                                        $verb = __gettext("replied to");
-                                
-                                // Wall owner
-                                $string = sprintf(__gettext("<a href=\"%s\">%s</a> $verb a message on <a href=\"%s\">%s's comment wall</a>"),
-                                        river_get_userurl($comment_owner),
-                                        user_info("name", $comment_owner),
-                                        river_get_userurl($wallowner),
-                                        user_info("name", $wallowner)
-                                );
-                                river_save_event($wallowner, $success, $comment_owner, "commentwall::post", $string);
-                                
-                                // Comment owner
-                                $noun = __gettext("A message");
-                                if ($reply!="")
-                                        $noun = __gettext("A reply");
-                                $string = sprintf(__gettext("$noun was left by <a href=\"%s\">%s</a> in <a href=\"%s\">%s's comment wall</a>"),
-                                        river_get_userurl($comment_owner),
-                                        user_info("name", $comment_owner),
-                                        river_get_userurl($wallowner),
-                                        user_info("name", $wallowner)
-                                );
-                                river_save_event($comment_owner, $success, $comment_owner, "commentwall::post", $string);
-                        }
-                }
-                else

devel/mod/commentwall/lib.php

@@ -104 +104 @@
-                notify_user($wall_id, __gettext("Someone has posted to your comment wall"), __gettext("Check it out") . ": " . $CFG->wwwroot . user_info("username", $wall_id) . "/profile/");
-            }
+                        $newcomment = plugin_hook("commentwall","publish",$newcomment); 
-            return $newcomment->ident;
-        }
-                
-
+
+
+
-        }
-        
@@ -126 +129 @@
-                {
-                        if (!delete_records("commentwall", "ident", $comment->ident))
+                                plugin_hook('commentwall','delete',$comment);
-                                return false;
-                                

devel/mod/community/lib.php

@@ -211 +211 @@
-        listen_for_event("user","delete","community_user_delete");
-        
-    // Register file river hook (if there)
-        if (function_exists('river_save_event'))
-        {
-                listen_for_event('community','publish', 'community_river_hook');
-                listen_for_event('community','delete', 'community_river_hook');
-    
-                river_register_friendlyname_hook('community::community', 'community_get_friendly_name');
-        }
-
-        register_user_type('community');
-}
-
-function community_get_friendly_name($object_type, $object_id)
-{
-        global $CFG;
-
-        if ($object_type == 'community::community')
-        {
-                $record = get_record_sql("SELECT * from {$CFG->prefix}users where ident=$object_id and user_type = 'community'");
-
-                if ($record)
-                {
-                        $community = user_info("name", $record->ident);
-                        $url = river_get_userurl($record->ident);
-                        
-                        return sprintf(__gettext("the community <a href=\"$url\">%s</a>"), $community);
-                }
-        }
-
-        return "";
-}
-
-function community_river_hook( $object_type, $event, $object)
-{
-        global $CFG;
-
-        $userid = ($_SESSION['userid'] == "" ? -1 : $_SESSION['userid']);
-        $object_id = $object->ident;
-        $object_owner = $object->owner;
-        $title = trim($object->name);
-
-        $username = user_info("name", $userid);
-        $weblogname = "<a href=\"" . river_get_userurl($userid) . "\">". user_info("name", $object_id) . "</a>'s";
-        if ($userid == $object_owner) $weblogname = __gettext("their");
-
-        if ($username == false) $username = __gettext("Anonymous user");
-        
-        if ($event == "publish")
-                river_save_event($userid, $object_id, $object_owner, $object_type, "<a href=\"" .  river_get_userurl($userid) . "\">$username</a> created the community <a href=\"{$CFG->wwwroot}{$object->username}\">{$object->name}</a>.");
-
-        return $object;
-}
-

devel/mod/community/lib/communities_actions.php

@@ -111 +111 @@
-                         $f->owner = $request->owner;
-                         $f->friend = $request->friend;
-
+$f->ident = 
-                             delete_records('friends_requests','ident',$request_id);
+                             plugin_hook("community:member","publish",$f);
-                             $messages[] = sprintf(__gettext("You approved the membership request. %s is now a member of this community."),stripslashes($request->name));
-                         } else {

devel/mod/community/lib/community_member_add.php

@@ -1 +1 @@
-<?php
-
-
-/*
- * community_member_add.php
@@ -7 +5 @@
- * Created on May 7, 2007
- *
-
-
+
- */
-global $USER;
@@ -14 +11 @@
-if (isset ($parameter)) {
-    $friend_id= $parameter[0];
+    if(!record_exists('friends','friend',$friend_id,'owner',$USER->ident)){
+      $f = new StdClass;
+      $f->owner = $USER->ident;
+      $f->friend = $friend_id;
+      $f->ident = insert_record('friends',$f);
+    }
+    else{
+        $f = get_record('friends','friend',$friend_id,'owner',$USER->ident);
+    }
-    $run_result= array ();
-    if (!empty ($friend_id) && logged_on) {
@@ -25 +31 @@
-                        $title= sprintf(__gettext("New %s member"), $friend->name);
-                        notify_user($owner->ident, $title, $message_body);
+                        plugin_hook("community:member","publish",$f);
-                    }
-                } else

devel/mod/community/lib/community_member_remove.php

@@ -1 +1 @@
-<?php
-
-
-/*
- * community_member_remove.php
@@ -7 +5 @@
- * Created on May 7, 2007
- *
-
-
+
- */
-global $USER;
@@ -25 +22 @@
-      case "separate" :
-        $community_name= user_info('username', $user_id);
-error_log("Eliminando owner = $friend_id friend=$user_id"
+$f = get_record('friends','owner',$friend_id,'friend',$user_id
-        if (delete_records("friends", "owner", $friend_id, "friend", $user_id)) {
+          plugin_hook("community:member","delete",$f); 
-          if ($action == "leave") {
-            $run_result[]= sprintf(__gettext("You left %s"), $community_name);

devel/mod/file/lib.php

@@ -148 +148 @@
-        // Register a display object function
-        display_set_display_function('file', 'file_displayobject');
-
-        // Register file river hook (if there)
-        if (function_exists('river_save_event'))
-        {
-                river_register_friendlyname_hook('file::file', 'file_get_friendly_name');
-
-                listen_for_event('file','publish', 'file_river_hook');
-                listen_for_event('file','delete', 'file_river_hook');
-        }
-}
-
@@ -168 +159 @@
-        }
-        return $run_result;
-}
-
-function file_get_friendly_name($object_type, $object_id)
-{
-        global $CFG;
-
-        $result = get_record_sql("select * from {$CFG->prefix}files where ident = $object_id");
-
-        $filepath = $CFG->wwwroot . user_info("username", $result->owner) . "/files/{$result->folder}/{$result->ident}/" . urlencode($result->originalname);
-
-        return "<a href=\"$filepath\">" . $result->originalname . "</a>";
-}
-
-function file_river_hook( $object_type, $event, $object)
-{
-        global $CFG;
-
-        $userid = ($_SESSION['userid'] == "" ? -1 : $_SESSION['userid']);
-        $object_id = $object->ident;
-        $object_owner = $object->owner;
-        
-        $filepath = $CFG->wwwroot . user_info("username", $userid) . "/files/{$object->folder}/{$object->ident}/" . urlencode($object->originalname);
-        $name = $object->originalname;
-
-        $username = user_info("username", $userid);
-        if ($userid == false) 
-                $username = __gettext("Anonymous user");
-        
-        if ($event == "publish")
-                river_save_event($userid, $object_id, $object_owner, $object_type, "<a href=\"" . river_get_userurl($userid) . "\">$username</a> uploaded '<a href=\"$filepath\">$name</a>'", $object->access);
-
-        if ($event == "delete")
-                river_save_event($userid, $object_id, $object_owner, $object_type, "<a href=\"" . river_get_userurl($userid) . "\">$username</a> deleted '$name'", $object->access);
-
-        return $object;
-}
-        

devel/mod/friend/lib/friends_actions.php

@@ -20 +20 @@
-                $f->friend = $friend_id;
-                if ($friend->moderation == 'no') {
-
+$f->ident = 
-                        if (user_info("user_type",$friend_id) == "person") {
-                            $messages[] = sprintf(__gettext("%s was added to your friends list."),$friend->name);
@@ -27 +27 @@
-                            $title = sprintf(__gettext("New %s friend"), $CFG->sitename);
-                            notify_user($u,$title,$message_body);
+                            plugin_hook('friends','publish',$f);
-                        }
-                    } else {
@@ -62 +63 @@
-                 if (user_info("user_type",$friend_id) == "person") {
-                     $messages[] = $friend->name . __gettext(" was removed from your friends.");
+                     $friend->owner=$USER->ident; 
+                     $friend->friend=$friend_id;
+                     plugin_hook('friends','delete',$friend);
-                 }
-             } else {
@@ -87 +91 @@
-                         $title = sprintf(__gettext("%s friend request approved!"), $CFG->sitename);
-                         notify_user($request->owner,$title,$message_body);
+                         plugin_hook('friends','publish',$f);
-                     } else {
-                         $messages[] = __gettext("An error occurred: couldn't add you as a friend");

devel/mod/template/templates/Default_Template/frontpage_loggedin

@@ -12 +12 @@
-    <a href="{{url}}{{username}}">View your profile</a>! Your portfolio is the main way people find out about you. You can edit your details and choose exactly what you want to share with whom.
-</p>
+