Changeset 1079

Timestamp:

04/23/07 13:18:33 (2 years ago)

Author:

ben

Message:

Minor fixes for the revamped blog code.

Files:

• devel/mod/blog/default_template.php (modified) (1 diff)
• devel/mod/blog/lib.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_actions.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_posts_add.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_posts_edit.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_text_process.php (modified) (5 diffs)

devel/mod/blog/default_template.php

@@ -47 +47 @@
-    );
-
-    $template_definition[] = array(
-        'id' => 'weblogtoolbar',
-        'name' => __gettext("Weblog toolbar"),
-        'description'=> __gettext("A placeholder for weblog related buttons (resources, videos)"),
-        'glossary' => array(
-            '{{buttons}}'=> __gettext("List of buttons")
-        )
-    );
-
-    $template_definition[] = array(
-        'id' => 'weblogtoolbarbutton',
-        'name' => __gettext("Weblog toolbar button"),
-        'description'=> __gettext("A toolbar button instance"),
-        'glossary' => array(
-            '{{title}}' => __gettext("Button title"),
-            '{{accesskey}}' => __gettext("Access key"),
-            '{{value}}' => __gettext("Button value if not image is specified"),
-            '{{image}}' => __gettext("Button image")
-        )
-    );
-
-    $template['weblogpost'] = file_get_contents(dirname(__FILE__)."/templates/blog_post.html");
-    $template['weblogcomments'] = file_get_contents(dirname(__FILE__)."/templates/blog_comments.html");
-    $template['weblogcomment'] = file_get_contents(dirname(__FILE__)."/templates/blog_comment.html");
-    $template['weblogtoolbar'] = file_get_contents(dirname(__FILE__)."/templates/blog_toolbar.html");
-    $template['weblogtoolbarbutton'] = file_get_contents(dirname(__FILE__)."/templates/blog_toolbarbutton.html");
-?>

devel/mod/blog/lib.php

@@ -144 +144 @@
-
-  $CFG->widgets->list[]= array ('name' => __gettext("Blog widget"),
-
+
+
-
-  $CFG->templates->variables_substitute['blog'][]= "blog_keyword";

devel/mod/blog/lib/weblogs_actions.php

@@ -167 +167 @@
-                            // Email comment if applicable
-                            if ($comment->owner != $post->owner) {
-__gettext(sprintf("You have received a comment from %s on your blog post '%s'. It reads as follows:", $comment->postedname, stripslashes($post->title)
+sprintf(__gettext("You have received a comment from %s on your blog post '%s'. It reads as follows:"), $comment->postedname, stripslashes($post->title
-                                $message .= "\n\n" . stripslashes($comment->body) . "\n\n";
-__gettext(sprintf("To reply and see other comments on this blog post, click here: %s", $CFG->wwwroot . user_info("username",$post->weblog) . "/weblog/" . $post->ident . ".html")
+sprintf(__gettext("To reply and see other comments on this blog post, click here: %s"), $CFG->wwwroot . user_info("username",$post->weblog) . "/weblog/" . $post->ident . ".html"
-                                $message = wordwrap($message);
-                                message_user($post->owner,$comment->owner,stripslashes($post->title),$message);

devel/mod/blog/lib/weblogs_posts_add.php

@@ -56 +56 @@
-
-    // Add the weblog toolbar
-
-
-
-
-
-
+
+
+
+
+
-
-    $body .= templates_draw(array(

devel/mod/blog/lib/weblogs_posts_edit.php

@@ -67 +67 @@
-
-    // Add the weblog toolbar
-
-
-
-
-
-
+
+
+
+
-
-    $body .= templates_draw(array(

devel/mod/blog/lib/weblogs_text_process.php

@@ -2 +2 @@
-
-    // Processes text
-
+
-    if (isset($parameter)) {
-        if (is_array($parameter)) {
@@ -11 +11 @@
-            $addrelnofollow = false;
-        }
-
+
-         $cachekey = sha1($addrelnofollow . "_" . $run_result);
-         if($cached = elggcache_get("weblogs_text_process:weblogs", $cachekey)) {
-             $run_result = $cached;
-         } else {
-
-
-
-
+
-            //check for mismatched <>s and force escaping if necessary
-            $numlt = substr_count($run_result, "<");
@@ -26 +23 @@
-                $run_result = htmlspecialchars($run_result, ENT_COMPAT, 'utf-8');
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            // URLs to links
-            $run_result = run("weblogs:html_activate_urls", $run_result);
-
+
-            // Remove the evil font tag
-            $run_result = preg_replace("/<font[^>]*>/i","",$run_result);
-            $run_result = preg_replace("/<\/font>/i","",$run_result);
-
+
-            // add rel="nofollow" to any links
-            if ($addrelnofollow) {
@@ -52 +40 @@
-                $run_result = preg_replace('/<a\s+/i', '<a rel="nofollow" ', $run_result);
-            }
-
+
-            // Text cutting
-            // Commented out for the moment as it seems to disproportionately increase
-            // memory usage / load
-
+
-            /*
-            global $individual;
-
+
-            if (!isset($individual) || $individual != 1) {
-                $run_result = preg_replace("/\{\{cut\}\}(.|\n)*(\{\{uncut\}\})?/","{{more}}",$run_result);
@@ -68 +56 @@
-            }
-            */
-            
-             $setresult = elggcache_set("weblogs_text_process:weblogs", $cachekey, $run_result);
-         }