From 3fe5a3a924904325361416eac54ff062a6b9a349 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 5 Mar 2005 12:48:36 +0000
Subject: [PATCH] moved contents of include.inc to edit.php

---
 lam/lib/include.inc            | 58 ----------------------------------
 lam/templates/account/edit.php | 32 +++++++++++++++++--
 2 files changed, 30 insertions(+), 60 deletions(-)
 delete mode 100644 lam/lib/include.inc

diff --git a/lam/lib/include.inc b/lam/lib/include.inc
deleted file mode 100644
index a25e8b90..00000000
--- a/lam/lib/include.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
-$Id$
-
-  This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
-  Copyright (C) 2003  Tilo Lutz
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-  LDAP Account Manager displays table for creating or modifying accounts in LDAP
-*/
-
-// Get Lampath, needed 4 includes
-$lampath_include = str_replace('account', '', str_replace('templates', '', realpath('.')));  // Save full path to lam in session
-$lampath_include = ereg_replace ( '[/]+', '/', $lampath_include);
-
-include_once($lampath_include.'lib/config.inc'); // File with configure-functions
-include_once($lampath_include.'lib/profiles.inc'); // functions to load and save profiles
-include_once($lampath_include.'lib/status.inc'); // Return error-message
-include_once($lampath_include.'lib/pdf.inc'); // Return a pdf-file
-include_once($lampath_include.'lib/ldap.inc'); // LDAP-functions
-include_once($lampath_include.'lib/modules.inc'); // LDAP-functions
-include_once($lampath_include.'lib/cache.inc');
-include_once($lampath_include.'lib/account.inc');
-
-// Start session
-session_save_path($lampath_include.'sess');
-@session_start();
-
-// Redirect to startpage if user is not loged in
-if (!isset($_SESSION['loggedIn'])) {
-	metaRefresh("../../login.php");
-	exit;
-	}
-
-// Set correct language, codepages, ....
-setlanguage();
-
-if (!isset($_SESSION['cache'])) {
-	$_SESSION['cache'] = new cache();
-	}
-
-$_SESSION['scope'] = array ('user', 'group', 'host', 'domain');
-
-?>
diff --git a/lam/templates/account/edit.php b/lam/templates/account/edit.php
index 574695bb..69af4554 100644
--- a/lam/templates/account/edit.php
+++ b/lam/templates/account/edit.php
@@ -23,11 +23,39 @@ $Id$
   LDAP Account Manager displays table for creating or modifying accounts in LDAP
 */
 
-include_once('../../lib/include.inc');
+/**
+* Displays the account detail page.
+*
+* @package modules
+* @author Tilo Lutz
+*/
+
+/** configuration options */
+include_once('../../lib/config.inc');
+/** functions to load and save profiles */
+include_once('../../lib/profiles.inc');
+/** Return error-message */
+include_once('../../lib/status.inc');
+/** Return a pdf-file */
+include_once('../../lib/pdf.inc');
+/** module functions */
+include_once('../../lib/modules.inc');
+
+// Start session
+session_save_path('../../sess');
+@session_start();
+
+// Redirect to startpage if user is not loged in
+if (!isset($_SESSION['loggedIn'])) {
+	metaRefresh("../login.php");
+	exit;
+	}
+
+// Set correct language, codepages, ....
+setlanguage();
 
 if ($_GET['DN']) {
 	//load account
-	if ($_GET['DN'] == $DN) $DN = str_replace("'", '',$_GET['DN']);
 	$DN = str_replace("\'", '', $_GET['DN']);
 	$type = str_replace("\'", '', $_GET['type']);
 	if ($_GET['type'] == $type) $type = str_replace("'", '',$_GET['type']);