Changeset 120 for branches

Timestamp:

04/11/06 22:44:51 (3 years ago)

Author:

michiel

Message:

remove the plugin stuff that's for 2.0
Update readme and changelog

Location:

branches/mvblog-1_6

Files:

• CHANGELOG (modified) (1 diff)
• README (modified) (3 diffs)
• admin/index.php (modified) (1 diff)
• common/functions_blog.php (modified) (5 diffs)
• plugins (deleted)

branches/mvblog-1_6/CHANGELOG

@@ -1 @@
-mvblog 2.0:
+mvblog 1.6:
 -----------
 *added styleswitcher function (ticket #17)
 *fixed stylesheet errors and added some meta tags
-*added plugin system (ticket #52)
 *logged in author's info is used in comments (ticket #42)
 *added admin interface for comments (ticket #41)
 *Added RSS for comments, both all and per article (ticket #4)
+
+*****IMPORTANT*****
+todsah identified those, and was kind enough to notify me as soon as he saw them.
+*Fixed several XSS (crossite scripting attacks) issues
+*Fixed several sql-injection issues
 
 mvblog 1.5:

branches/mvblog-1_6/README

@@ -1 @@
-MvBlog v 1.5
+MvBlog v 1.6
 
 Copyright (c) 2005-2006, Michiel van Baak <mvanbaak (AT) users (DOT) sourceforge (DOT) net>
@@ -39 +39 @@
 Managing categories
 PHP5 support
-Plugin system (#52, michiel)
 
 3. Requirements.
@@ -186 +185 @@
         Nieke   (http://leonieke.net)
         Kermit  (http://xulon.info)
+        todsah  (http://www.electricmonk.nl)
   
   Various suggestions and patches:
   --------------------------------
+        todsah  (Identified multiple sql injections and XSS attacks)
 
   Used software:

branches/mvblog-1_6/admin/index.php

@@ -1130 +1130 @@
 }
 
-//}}}-------------
-//{{{ plugin stuff
-//----------------
-function load_admin_plugins() {
-        /* this should become a setting */
-        $plugins = array();
-        $plugin_dir = "../plugins/";
-        if (is_dir($plugin_dir)) {
-                $plug_fd = opendir($plugin_dir);
-                while (false !== ($fp = readdir($plug_fd))) {
-                        if (!preg_match("/^\./", $fp)) {
-                                require_once($plugin_dir.$fp);
-                        }
-                }
-        }
-}
-        
-function register_admin_plugin($name, $type) {
-        echo "<!-- registering plugin: $name -->\n";
-        $GLOBALS["admin_plugins"][$type][] = $name;
-}
-
-function getAdminPluginsByType($type) {
-        if (is_array($GLOBALS["admin_plugins"][$type])) {
-                foreach ($GLOBALS["admin_plugins"][$type] as $p) {
-                        $plugs[] = $p;
-                }
-        } else {
-                $plugs[] = "";
-        }
-        return $plugs;
-}
-
 //}}}--------------------------------
 //{{{ show the user some html code ;)
 //-----------------------------------
 html_header_admin("Admin Interface", ".");
-load_admin_plugins();
         ?>
         <div id="if_container">

branches/mvblog-1_6/common/functions_blog.php

@@ -43 +43 @@
 ob_start();
 $db = db_init();
-$version = "SVN";
-$plugins = array();
-/* populate the $plugins array */
-load_plugins();
+$version = "1.6";
 //}}}--------------------------------------------------------
 //{{{ check_admin_logged_in: are we logged in as admin user ?
@@ -157 +154 @@
                 <div class="log_body">
                         <div class="log_contents">
-                                <?=run_plugins(strip_invalid_xml(stripslashes(str_replace("##BREAKPOINT##", "", $row["body"]))), "text_output")?>
+                                <?=strip_invalid_xml(stripslashes(str_replace("##BREAKPOINT##", "", $row["body"])))?>
                         </div>
                 </div>
@@ -193 +190 @@
                                                 echo "[Comment deleted by admin on ".date("d-m-Y H:i", $row["deleted"])."]";
                                         } else {
-                                                echo nl2br(stripslashes(htmlspecialchars(strip_invalid_xml(run_plugins($row["comment"], "text_output")))));
+                                                echo nl2br(stripslashes(htmlspecialchars(strip_invalid_xml($row["comment"]))));
                                         }
                                         ?>
@@ -614 +611 @@
                                         <? } ?>
                                                 <?
-                                                if (limit_text(run_plugins(strip_invalid_xml(stripslashes($row["body"])), "text_output"), 4000)) {
+                                                if (limit_text(strip_invalid_xml(stripslashes($row["body"])), 4000)) {
                                                         ?><br /><br /><a href="index.php?action=view&amp;id=<?=$row["id"]?>" class="link_readmore">read more</a><?
                                                 }
@@ -719 +716 @@
         return $data;
 }
-//}}}-------------------------------------
-//{{{ load_plugins(): load all the plugins
-//----------------------------------------
-function load_plugins() {
-        /* this should become a setting */
-        $plugins = array();
-        $plugin_dir = "plugins/";
-        if (is_dir($plugin_dir)) {
-                $plug_fd = opendir($plugin_dir);
-                while (false !== ($fp = readdir($plug_fd))) {
-                        if (!preg_match("/^\./", $fp)) {
-                                require_once($plugin_dir.$fp);
-                        }
-                }
-        }
-}
-        
-function register_plugin($name, $type) {
-        $GLOBALS["plugins"][$type][] = $name;
-}
-
-function getPluginsByType($type) {
-        if (is_array($GLOBALS["plugins"][$type])) {
-                foreach ($GLOBALS["plugins"][$type] as $p) {
-                        $plugs[] = $p;
-                }
-        } else {
-                $plugs[] = "";
-        }
-        return $plugs;
-}
-//}}}--------------------------------------------------
-//{{{ run_plugins($data, $types): run specified plugins
-//-----------------------------------------------------
-function run_plugins($data, $types) {
-        if (!is_array($types)) {
-                $plugintypes[0] = $types;
-        } else {
-                $plugintypes = $types;
-        }
-        unset($types);
-        foreach($plugintypes as $type) {
-                $plugins = getPluginsByType($type);
-        }
-        foreach ($plugins as $plugin) {
-                if (function_exists("plugin_$plugin")) {
-                        $data = eval("return plugin_$plugin(\$data);");
-                }
-        }
-        return $data;
-}
 
 //}}}---------------------------------------