- no changes, just line endings that got foubared.

1 files changed, 98 insertions, 98 deletions

diff --git a/includes/module.inc b/includes/module.inc
index 389593b81..2e8476572 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -1,98 +1,98 @@
-<?php

-// $Id$

-

-// initialize modules:

-function module_init() {

-  module_list();

-}

-

-// apply function $function to every known module:

-function module_iterate($function, $argument = "") {

-  foreach (module_list() as $name) $function($name, $argument);

-}

-

-// invoke hook $hook of module $name with optional arguments:

-function module_invoke($name, $hook, $a1 = NULL, $a2 = NULL, $a3 = NULL, $a4 = NULL) {

-  $function = $name ."_". $hook;

-  if (function_exists($function)) {

-    return $function($a1, $a2, $a3, $a4);

-  }

-}

-

-// return array of module names (includes lazy module loading):

-function module_list() {

-  static $list;

-

-  if (!$list) {

-    if ($handle = @opendir("modules")) {

-      $list = array();

-      while ($file = readdir($handle)) {

-        if (".module" == substr($file, -7)) {

-          $filename = substr($file, 0, -7);

-          $list[$filename] = $filename;

-          include "modules/$filename.module";

-        }

-      }

-      closedir($handle);

-      asort($list);

-    }

-    else {

-      $list = array();

-    }

-  }

-

-  return $list;

-}

-

-// return 1 if module $name exists, 0 otherwise:

-function module_exist($name) {

-  $list = module_list();

-  return ($list[$name]) ? 1 : 0;

-}

-

-// return 1 if module $name implements hook $hook, 0 otherwise:

-function module_hook($name, $hook) {

-  return function_exists($name ."_". $hook);

-}

-

-// rehash module-exported blocks:

-function module_rehash_blocks($name) {

-  db_query("UPDATE blocks SET remove = '1' WHERE module = '$name'");

-

-  if ($blocks = module_invoke($name, "block")) {

-    foreach ($blocks as $delta => $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, delta) VALUES ('$block[info]', '$name', '$delta')");

-      }

-      else {

-        db_query("UPDATE blocks SET delta = '$delta', remove = '0' WHERE module = '$name' AND name = '$block[info]'");

-      }

-    }

-  }

-

-  db_query("DELETE FROM blocks WHERE module = '$name' AND remove = '1'");

-}

-

-// rehash a module:

-function module_rehash($name) {

-  if (module_exist($name)) {

-    $result = db_query("SELECT * FROM modules WHERE name = '$name'");

-

-    if (!$object = db_fetch_object($result)) {

-      db_query("INSERT INTO modules (name) VALUES ('$name')");

-    }

-

-    // rehash module-exported blocks (if necessary):

-    module_rehash_blocks($name);

-  }

-  else {

-    // remove all reference to module:

-    db_query("DELETE FROM modules WHERE name = '$name'");

-    db_query("DELETE FROM blocks WHERE module = '$name'");

-  }

-}

-

-?>

+<?php
+// $Id$
+
+// initialize modules:
+function module_init() {
+  module_list();
+}
+
+// apply function $function to every known module:
+function module_iterate($function, $argument = "") {
+  foreach (module_list() as $name) $function($name, $argument);
+}
+
+// invoke hook $hook of module $name with optional arguments:
+function module_invoke($name, $hook, $a1 = NULL, $a2 = NULL, $a3 = NULL, $a4 = NULL) {
+  $function = $name ."_". $hook;
+  if (function_exists($function)) {
+    return $function($a1, $a2, $a3, $a4);
+  }
+}
+
+// return array of module names (includes lazy module loading):
+function module_list() {
+  static $list;
+
+  if (!$list) {
+    if ($handle = @opendir("modules")) {
+      $list = array();
+      while ($file = readdir($handle)) {
+        if (".module" == substr($file, -7)) {
+          $filename = substr($file, 0, -7);
+          $list[$filename] = $filename;
+          include "modules/$filename.module";
+        }
+      }
+      closedir($handle);
+      asort($list);
+    }
+    else {
+      $list = array();
+    }
+  }
+
+  return $list;
+}
+
+// return 1 if module $name exists, 0 otherwise:
+function module_exist($name) {
+  $list = module_list();
+  return ($list[$name]) ? 1 : 0;
+}
+
+// return 1 if module $name implements hook $hook, 0 otherwise:
+function module_hook($name, $hook) {
+  return function_exists($name ."_". $hook);
+}
+
+// rehash module-exported blocks:
+function module_rehash_blocks($name) {
+  db_query("UPDATE blocks SET remove = '1' WHERE module = '$name'");
+
+  if ($blocks = module_invoke($name, "block")) {
+    foreach ($blocks as $delta => $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, delta) VALUES ('$block[info]', '$name', '$delta')");
+      }
+      else {
+        db_query("UPDATE blocks SET delta = '$delta', remove = '0' WHERE module = '$name' AND name = '$block[info]'");
+      }
+    }
+  }
+
+  db_query("DELETE FROM blocks WHERE module = '$name' AND remove = '1'");
+}
+
+// rehash a module:
+function module_rehash($name) {
+  if (module_exist($name)) {
+    $result = db_query("SELECT * FROM modules WHERE name = '$name'");
+
+    if (!$object = db_fetch_object($result)) {
+      db_query("INSERT INTO modules (name) VALUES ('$name')");
+    }
+
+    // rehash module-exported blocks (if necessary):
+    module_rehash_blocks($name);
+  }
+  else {
+    // remove all reference to module:
+    db_query("DELETE FROM modules WHERE name = '$name'");
+    db_query("DELETE FROM blocks WHERE module = '$name'");
+  }
+}
+
+?>