Changeset 1280

Timestamp:

11/08/07 21:20:07 (1 year ago)

Author:

rho

Message:

restored fixes and tweaks on blog mod

Sign-off-by: Rolando Espinoza La Fuente <rho@prosoftpeople.com>

Files:

• devel/mod/blog/lib.php (modified) (3 diffs)
• devel/mod/blog/lib/weblogs_actions.php (modified) (3 diffs)
• devel/mod/blog/lib/weblogs_posts_add.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_posts_edit.php (modified) (4 diffs)
• devel/mod/blog/lib/weblogs_posts_view.php (modified) (3 diffs)
• devel/mod/blog/lib/weblogs_user_info_menu.php (modified) (1 diff)

devel/mod/blog/lib.php

@@ -224 +224 @@
-    $CFG->display_field_module["selectg"]= "blog";
-  }
+  if (!array_key_exists("selectd", $CFG->display_field_module) && !array_key_exists("date_select", $CFG->display_field_module)) {
+    $CFG->display_field_module["selectd"]= "blog";
+    $CFG->display_field_module["date_select"]= "blog";
+  }
-  if (!array_key_exists("radio", $CFG->display_field_module)) {
-    $CFG->display_field_module["radio"]= "blog";
@@ -236 +240 @@
-  $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;
-}
-
@@ -530 +591 @@
-    $run_result .="</select><br>";
-  break;
+  case "date_select":
+  case "selectd":
+    $par = explode("/",$parameter[1]);
+    $run_result .= "
+    <script language=\"JavaScript\">
+    function select_date(form){
+    var date = \"\"+form.dd.value+\"/\"+form.mm.value+\"/\"+form.aaaa.value;
+    form.$cleanid.value = date;
+    }
+    </script>";
+    for($i=0;$i<31;$i++){
+      $data['dd'][] = ($i+1);
+    }
+    for($i=0;$i<12;$i++){
+      $data['mm'][] = ($i+1);
+    }
+    $ya = getdate();
+    for($i=0;$i<100;$i++){
+      $data['aaaa'][] = (($ya['year']-99)+$i);
+    }
+    $i = 0;
+    foreach($data as $key=>$option){
+      $run_result .= "$key&nbsp;<select name=\"".$key."\"  onchange=\"select_date(this.form)\"  />";
+      foreach($option as $valor){
+        $run_result .="<option value=\"".htmlspecialchars(stripslashes($valor), ENT_COMPAT, 'utf-8')."\" ";
+        if($par[$i]==$valor){$run_result .= " selected ";}
+        $run_result .= " >$valor</option>\n";
+      }
+      $run_result .="</select>&nbsp;";
+      $i++;
+    }
+    $run_result .="
+    <input type=\"hidden\" name=\"".$parameter[0]."\" value=\"".$parameter[1]."\" id=\"".$cleanid."\" >";
+  break;
+
-  }
-  return $run_result;

devel/mod/blog/lib/weblogs_actions.php

@@ -40 +40 @@
-            // define('redirect_url',url . $_SESSION['username'] . "/weblog/");
-            define('redirect_url',url . user_info("username",$page_owner) . "/$extensionContext/");
+        } else {
+            $messages[] = __gettext("Your post wasn't added to the blog. This was probably because it was empty, or you don't currently have permission to post in this blog.");
-        }
-        break;
@@ -174 +176 @@
-                                $messages[] = __gettext("Your comment has been added."); // gettext variable
-                            }
+                            
+                                // If river plugin installed then note comment
+                                                        if (function_exists('river_save_event'))
+                                                        {
+                                                                $un = user_info("username", $comment->owner);
+                                                                
+                                                                $commenturl = $CFG->wwwroot."$un/weblog/{$comment->post_id}.html#cmt{$comment->ident}";
+                                                                $username = "<a href=\"" . river_get_userurl($comment->owner) . "\">$un</a>";
+                                                                if (!isset($comment->owner)) 
+                                                                {
+                                                                        $comment->owner = -1;
+                                                                        $username = __gettext("Anonymous user");
+                                                                }
+                                        
+                                                                river_save_event($post->owner, $comment->ident, $comment->owner, "weblog_post::post", $username . " <a href=\"$commenturl\">" . __gettext("commented on") . "</a> " . river_get_friendly_id("weblog_post::post", $comment->post_id));
+                                                                
+                                                        }
-                        }
-                    }
@@ -187 +206 @@
-    // Delete a weblog comment
-    case "weblog_comment_delete":
-
+,0,PARAM_INT
-        if (logged_on && !empty($comment_id)) {
-            $commentinfo = get_record_sql('SELECT wc.*,wp.owner AS postowner,wp.ident AS postid

devel/mod/blog/lib/weblogs_posts_add.php

@@ -33 +33 @@
-
-    if(array_key_exists($extensionContext,$CFG->weblog_extensions)){
-$CFG->weblog_extensions[$extensionContext]['field']
-$CFG->weblog_extensions[$extensionContext]['values']
+(isset($CFG->weblog_extensions[$extensionContext]['field'])) ? $CFG->weblog_extensions[$extensionContext]['field'] : ''
+(isset($CFG->weblog_extensions[$extensionContext]['values'])) ? $CFG->weblog_extensions[$extensionContext]['values'] : ''
-    }
-

devel/mod/blog/lib/weblogs_posts_edit.php

@@ -26 +26 @@
-
-if(array_key_exists($extensionContext,$CFG->weblog_extensions)){
-$CFG->weblog_extensions[$extensionContext]['type']
-$CFG->weblog_extensions[$extensionContext]['field']
-$CFG->weblog_extensions[$extensionContext]['values']
+(isset($CFG->weblog_extensions[$extensionContext]['type'])) ? $CFG->weblog_extensions[$extensionContext]['type'] : ''
+(isset($CFG->weblog_extensions[$extensionContext]['field'])) ? $CFG->weblog_extensions[$extensionContext]['field'] : ''
+(isset($CFG->weblog_extensions[$extensionContext]['values'])) ? $CFG->weblog_extensions[$extensionContext]['values'] : ''
-  if(array_key_exists('extra_type',$CFG->weblog_extensions[$extensionContext])){
-    $extraTypes = $CFG->weblog_extensions[$extensionContext]['extra_type'];
@@ -41 +41 @@
-    $first = true;
-    foreach($tags as $key => $tag) {
-
+is_array($extraValue) && 
-        if (empty($first)) {
-          $keywords .= ", ";
@@ -94 +94 @@
-    $body .= run("weblogs:posts:add:fields:after",array($page_owner,$post));
-
-isset($extraField) && isset
+!empty($extraField) && !empty
-      $body .= templates_draw(array(
-                                'context' => 'databox',
@@ -108 +108 @@
-                                'name' => $Keywords,
-                                'column1' => "<i>$keywordDesc</i>",
-new
+edit
-                            )
-                            );

devel/mod/blog/lib/weblogs_posts_view.php

@@ -85 +85 @@
-
-    if ($post->owner != $post->weblog) {
-$post_authors[$post->owner]->icon == -1 && $specialicon==null
+empty($specialicon) && $post_authors[$post->owner]->icon == -1
-            $usericon = $post_authors[$post->weblog]->icon;
-        }
@@ -100 +100 @@
-    && isset($CFG->weblog_extensions[$extensionContext]['field'])
-    && isset($CFG->weblog_extensions[$extensionContext]['values'])){
-$CFG->weblog_extensions[$extensionContext]['type']
-$CFG->weblog_extensions[$extensionContext]['field']
-$CFG->weblog_extensions[$extensionContext]['values']
+(isset($CFG->weblog_extensions[$extensionContext]['type'])) ? $CFG->weblog_extensions[$extensionContext]['type'] : ''
+(isset($CFG->weblog_extensions[$extensionContext]['field'])) ? $CFG->weblog_extensions[$extensionContext]['field'] : ''
+(isset($CFG->weblog_extensions[$extensionContext]['values'])) ? $CFG->weblog_extensions[$extensionContext]['values'] : ''
-      $filter = $extraType;
-    }
@@ -136 +136 @@
-        $links = "";
-    }
+    $links .= run("weblog:post:links",$post);
-
-    if (!isset($_SESSION['comment_cache'][$post->ident]) || (time() - $_SESSION['comment_cache'][$post->ident]->created > 120)) {

devel/mod/blog/lib/weblogs_user_info_menu.php

@@ -36 +36 @@
-            $personalWeblog = __gettext("Personal blog");
-            $body .= <<< END
-RSS
+<img src="{$CFG->wwwroot}mod/template/icons/rss.png" alt="RSS" border="0" />
-END;
-        } else if (user_type($page_owner) == "community") {
-            $communityWeblog = __gettext("Community blog");
-            $body .= <<< END
-RSS
+<img src="{$CFG->wwwroot}mod/template/icons/rss.png" alt="RSS" border="0" />
-END;
-        }