rework class system to use subdirectories

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 702843c1601416d6b303447a99b1226de89e3eca..ac07974e8b70d435f64028220263e57848a385cb 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -3,7 +3,10 @@
        define('SCHEMA_VERSION', 94);
 
        function __autoload($class) {
-               $file = dirname(__FILE__)."/../classes/".strtolower(basename($class)).".php";
+               $class_file = str_replace("_", "/", strtolower(basename($class)));
+
+               $file = dirname(__FILE__)."/../classes/$class_file.php";
+
                if (file_exists($file)) {
                        require $file;
                }
@@ -3194,6 +3197,7 @@
        }
 
        function format_article($link, $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+               global $plugins;
 
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -3256,6 +3260,8 @@
 
                        $line = db_fetch_assoc($result);
 
+                       $plugins->hook('article_before', $line);
+
                        if ($line["icon_url"]) {
                                $feed_icon = "<img src=\"" . $line["icon_url"] . "\">";
                        } else {
@@ -3359,7 +3365,7 @@
                                $button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
 
                                foreach ($button_plugins as $p) {
-                                       $pclass = trim("${p}_button");
+                                       $pclass = trim("button_${p}");
 
                                        if (class_exists($pclass)) {
                                                $plugin = new $pclass($link);
@@ -3468,6 +3474,8 @@
                        $rv['content'] .= "</body></html>";
                }
 
+               $plugins->hook('article_after', $rv);
+
                return $rv;
 
        }