From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/capp.php | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/interface/web/capp.php b/interface/web/capp.php
index 6317734..7917aa0 100644
--- a/interface/web/capp.php
+++ b/interface/web/capp.php
@@ -33,12 +33,16 @@
//* Import module variable
$mod = $_REQUEST["mod"];
+//* If we click on a search result, load that one instead of the module's start page
+$redirect = (isset($_REQUEST["redirect"]) ? $_REQUEST["redirect"] : '');
//* Check if user is logged in
if($_SESSION["s"]["user"]['active'] != 1) {
die("URL_REDIRECT: /index.php");
//die();
}
+
+if(!preg_match("/^[a-z]{2,20}$/i", $mod)) die('module name contains unallowed chars.');
//* Check if user may use the module.
$user_modules = explode(",",$_SESSION["s"]["user"]["modules"]);
@@ -48,9 +52,28 @@
//* Load module configuration into the session.
if(is_file($mod."/lib/module.conf.php")) {
include_once($mod."/lib/module.conf.php");
- $_SESSION["s"]["module"] = $module;
+
+ $menu_dir = ISPC_WEB_PATH.'/' . $mod . '/lib/menu.d';
+
+ if (is_dir($menu_dir)) {
+ if ($dh = opendir($menu_dir)) {
+ //** Go through all files in the menu dir
+ while (($file = readdir($dh)) !== false) {
+ if ($file != '.' && $file != '..' && substr($file, -9, 9) == '.menu.php' && $file != 'dns_resync.menu.php') {
+ include_once($menu_dir . '/' . $file);
+ }
+ }
+ }
+ }
+
+ $_SESSION["s"]["module"] = $module;
session_write_close();
- echo "HEADER_REDIRECT:".$_SESSION["s"]["module"]["startpage"];
+ if($redirect == ''){
+ echo "HEADER_REDIRECT:".$_SESSION["s"]["module"]["startpage"];
+ } else {
+ //* If we click on a search result, load that one instead of the module's start page
+ echo "HEADER_REDIRECT:".$redirect;
+ }
} else {
$app->error($app->lng(302));
}
--
Gitblit v1.9.1