From 4c8ff7c5787f6d35cca76e3fda0e9e4d051fe4eb Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 28 Jan 2010 14:22:42 +0000
Subject: Make use of the new module parameter system.
---
utils/modules/events.php | 32 +++++++++++++++++++-------------
utils/modules/links.php | 8 +++++---
2 files changed, 24 insertions(+), 16 deletions(-)
(limited to 'utils')
diff --git a/utils/modules/events.php b/utils/modules/events.php
index 9fdf0b8..63fb080 100644
--- a/utils/modules/events.php
+++ b/utils/modules/events.php
@@ -1,10 +1,11 @@
<?php
/* -*- Mode: php; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-global $UTIL_DIR;
+global $UTIL_DIR, $MODULES_DIR;
include_once($UTIL_DIR . "/convert.php");
include_once($UTIL_DIR . "/markdown.php");
+include_once($MODULES_DIR . "/icons.php");
class Event {
public $title;
@@ -239,18 +240,23 @@ class Events {
{
foreach($params as $param => $value) {
switch($param) {
- case "coming":
- return $this->showcoming(-1);
- break;
-
- case "all":
- return $this->showall(-1);
- break;
-
- case "old":
- default:
- return $this->showold(-1);
- break;
+ case "show":
+ switch($value) {
+ case "coming":
+ return $this->showcoming(-1);
+ break;
+
+ case "old":
+ return $this->showold(-1);
+ break;
+
+ case "all":
+ default:
+ return $this->showall(-1);
+ }
+
+ default:
+ return $this->showall(-1);
}
}
}
diff --git a/utils/modules/links.php b/utils/modules/links.php
index ba68122..efa20ef 100644
--- a/utils/modules/links.php
+++ b/utils/modules/links.php
@@ -99,12 +99,14 @@ class Links {
foreach($params as $param => $value) {
if(!$param) continue;
switch($param) {
- case "all":
- $groupid = "all";
+ case "group":
+ $groupid = $value;
break;
+
+ case "all":
default:
- $groupid = $param;
+ $groupid = "all";
break;
}
}
--
cgit v1.2.3