Changeset 82 for branches

Timestamp:

04/02/06 17:33:30 (3 years ago)

Author:

michiel

Message:

removed the acronym stuff from the core and introduced it as plugin

Files:

• branches/mvblog-plugins/common/functions_blog.php (modified) (8 diffs)

branches/mvblog-plugins/common/functions_blog.php

@@ -3 +3 @@
  * MvBlog -- An open source no-noncence blogtool
  *
- * Copyright (C) 2005, Michiel van Baak
+ * Copyright (C) 2005-2006, Michiel van Baak
  * Logo design (C) 2005, Sofie van Tendeloo
  *
@@ -37 +37 @@
         return $db;
 }
+//}}}---------------------------
+//{{{ initialize the mvblog tool
+//------------------------------
 session_start();
 ob_start();
 $db = db_init();
-$acronyms = array();
 $version = "SVN \$Id$";
 $plugins = array();
@@ -111 +113 @@
 //-------------------------------------------------------
 function show_article($id) {
-        global $db, $acronyms;
+        global $db;
         //get all the authors in an array
         $res =& $db->query("SELECT * FROM authors");
@@ -132 +134 @@
                 $categories[$row["id"]] = $row["name"];
         }
-        //same with acronyms
-        $res =& $db->query("SELECT acronym,description FROM acronyms");
-        if (PEAR::isError($res)) {
-                die($res->getMessage());
-        }
-        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-                $acronyms[$row["acronym"]] = $row["description"];
-        }
-
         $res =& $db->query("SELECT * FROM articles WHERE id=$id");
 
@@ -157 +150 @@
                 <div class="log_body">
                         <div class="log_contents">
-                                <?=acro_replace(strip_invalid_xml(str_replace("##BREAKPOINT##", "", $row["body"])))?>
+                                <?=run_plugins(strip_invalid_xml(str_replace("##BREAKPOINT##", "", $row["body"])), "text_output")?>
                         </div>
                 </div>
@@ -187 +180 @@
                         <div class="log_body">
                                 <div class="log_contents">
-                                        <?=nl2br(strip_invalid_xml(acro_replace($row["comment"])))?>
+                                        <?=nl2br(strip_invalid_xml(run_plugins($row["comment"], "text_output")))?>
                                 </div>
                                 <div class="log_foot">
@@ -338 +331 @@
         switch ($_REQUEST["action"]) {
                 case "view"         : show_article($_REQUEST["id"]);      break;
-                case "saveacro"     : save_acro_to_db();                  break;
                 case "post_comment" : post_comment($_POST);               break;
                 case "rss"          : header("Location: common/rss.php"); break;
@@ -694 +686 @@
         <?
 }
-
-//}}}------------------------------------------
-//{{{ acro_replace(): do some acronym replacing
-//---------------------------------------------
-function acro_replace($text) {
-        global $acronyms;
-        foreach ($acronyms as $acronym => $description) {
-                //replace all the supplied acronyms
-                $text = preg_replace("|(?!<[^<>]*?)(?<![?./&])\b$acronym\b(?!:)(?![^<>]*?>)|imsU","<acronym class=\"blog_acro\" title=\"$description\">$acronym</acronym>" , $text);
-                //allow user to overwrite acronym replacing by putting the term between $ signs
-                $text = preg_replace("|[$]<acronym class=\"blog_acro\" title=\"$description\">$acronym</acronym>[$]|imsU" , "$acronym" , $text);
-        }
-        return trim($text);
-}
 //}}}---------------------------------------------------------------
 //{{{ strip_invalid_xml(): strip some stuff leftover from old editor