Changes

- Fixed an error in module_rehash_blocks() that didn't handle '-symbols.
- Removed some module depencies. Drupal will now run (sorta) even if there
  are no modules installed.
- Changed theme_link() to check if certain modules are installed before
  offering a link to them.

Todo
- Check all SQL queries to make sure they are addslashes'ed correctly.
- Check the effects of changing the PHP magic_quotes setting.
- Make the theme_link() function to be customizable either via the admin
  page and/or in the module itself.

2 files changed, 13 insertions, 5 deletions

diff --git a/includes/module.inc b/includes/module.inc
index 6c1ca1c51..a23d142a0 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -37,6 +37,9 @@ function module_rehash_blocks($name, $module) {
   db_query("UPDATE blocks SET remove = '1' WHERE module = '$name'");
   if ($module["block"] && $blocks = $module["block"]()) {
     foreach ($blocks as $offset=>$block) {
+      foreach ($block as $item=>$data) {
+        $block[$item] = addslashes($data);
+      }
       if (!db_fetch_object(db_query("SELECT * FROM blocks WHERE module = '$name' AND name = '$block[info]'"))) {
         db_query("INSERT INTO blocks (name, module, offset) VALUES ('$block[info]', '$name', '$offset')");
       }
@@ -75,8 +78,10 @@ function module_rehash($name) {
 
 // load modules into repository:
 $handle = opendir("modules");
+$repository = array();
 while ($file = readdir($handle)) {
-  if ($filename = substr($file, 0, strpos($file, ".module"))) {
+  if (".module" == substr($file, -7)) {
+    $filename = substr($file, 0, -7);
     include "modules/$filename.module";
     $repository[$filename] = $module;
   }
diff --git a/includes/theme.inc b/includes/theme.inc
index 51f42850c..dbeb5fab8 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -13,12 +13,15 @@ function theme_init() {
 }
 
 function theme_link($separator = " | ") {
+  global $repository;
   $links = array("<A HREF=\"index.php\">". t("home") ."</A>",
                  "<A HREF=\"search.php\">". t("search") ."</A>",
-                 "<A HREF=\"submit.php\">". t("submit") ."</A>",
-                 "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>",
-                 "<A HREF=\"account.php\">". t("account") ."</A>",
-                 "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>");
+                 "<A HREF=\"submit.php\">". t("submit") ."</A>");
+  if (is_array($repository[diary]))
+    $links[] = "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>";
+  $links[] = "<A HREF=\"account.php\">". t("account") ."</A>";
+  if (is_array($repository[diary]))
+    $links[] = "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>";
   return implode($separator, $links);
 }