From 5a43e7a2ea0cf7af35c100cb67e4a53566cbc496 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 03 Feb 2012 05:58:01 -0500
Subject: [PATCH] - Implemented new backup and restore functions for websites and databases (see also FS#1389) - Added "actions" framework in server to replace the functions provided by the core modules - Moved system update function from remoteactins core module to software update plugin.
---
interface/web/content.php | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/interface/web/content.php b/interface/web/content.php
index cd19cd4..52ea216 100644
--- a/interface/web/content.php
+++ b/interface/web/content.php
@@ -31,15 +31,20 @@
require_once('../lib/config.inc.php');
require_once('../lib/app.inc.php');
+/*
$module = $_REQUEST["s_mod"];
$page = $_REQUEST["s_pg"];
+*/
-if(!preg_match("/^[a-z]{0,20}$/i", $module)) die('module name contains unallowed chars.');
-if(!preg_match("/^[a-z]{0,20}$/i", $page)) die('page name contains unallowed chars.');
+$module = 'login';
+$page = 'index';
-if(is_file("$module/$page.php")) {
+if(!preg_match("/^[a-z]{2,20}$/i", $module)) die('module name contains unallowed chars.');
+if(!preg_match("/^[a-z]{2,20}$/i", $page)) die('page name contains unallowed chars.');
+
+if(is_file(ISPC_WEB_PATH."/$module/$page.php")) {
- include_once("$module/$page.php");
+ include_once(ISPC_WEB_PATH."/$module/$page.php");
$classname = $module.'_'.$page;
$page = new $classname();
@@ -54,8 +59,8 @@
if(!preg_match("/^[a-z]{2,20}$/i", $module)) die('target module name contains unallowed chars.');
if(!preg_match("/^[a-z]{2,20}$/i", $page)) die('target page name contains unallowed chars.');
- if(is_file("$module/$page.php")) {
- include_once("$module/$page.php");
+ if(is_file(ISPC_WEB_PATH."/$module/$page.php")) {
+ include_once(ISPC_WEB_PATH."/$module/$page.php");
$classname = $module.'_'.$page;
$page = new $classname();
@@ -70,8 +75,7 @@
} elseif (is_array($_SESSION["s"]['user']) or is_array($_SESSION["s"]["module"])) {
// If the user is logged in, we try to load the default page of the module
- die('hhhhh');
-
+ die('- error -');
} else {
die('Page does not exist.');
}
--
Gitblit v1.9.1