WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed config classes

This commit is contained in:
Roland Gruber 2006-09-24 14:19:50 +00:00
parent 47f66d2f81
commit bbd7272c0c
10 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lam/lib/config.inc
View File

@ -120,7 +120,7 @@ function metaRefresh($page) {
* *
* @package configuration * @package configuration
*/ */
class Config { class LAMConfig {
/** Server address (e.g. ldap://127.0.0.1:389) */ /** Server address (e.g. ldap://127.0.0.1:389) */
var $ServerURL; var $ServerURL;
@ -182,7 +182,7 @@ class Config {
* *
* @param integer $file Index number in config file array * @param integer $file Index number in config file array
*/ */
function Config($file = 0) { function LAMConfig($file = 0) {
// load first profile if none is given // load first profile if none is given
if (!is_string($file)) { if (!is_string($file)) {
$profiles = getConfigProfiles(); $profiles = getConfigProfiles();
@ -711,7 +711,7 @@ class Config {
* *
* @package configuration * @package configuration
*/ */
class CfgMain { class LAMCfgMain {
/** Default profile */ /** Default profile */
var $default; var $default;
@ -738,7 +738,7 @@ class CfgMain {
/** /**
* Loads preferences from config file * Loads preferences from config file
*/ */
function CfgMain() { function LAMCfgMain() {
// set default values // set default values
$this->sessionTimeout = 30; $this->sessionTimeout = 30;
$this->logLevel = LOG_NOTICE; $this->logLevel = LOG_NOTICE;

4
lam/lib/security.inc
View File

@ -75,7 +75,7 @@ function startSecureSession() {
* *
*/ */
function checkClientIP() { function checkClientIP() {
$cfg = new CfgMain(); $cfg = new LAMCfgMain();
$allowedHosts = $cfg->allowedHosts; $allowedHosts = $cfg->allowedHosts;
// skip test if no hosts are defined // skip test if no hosts are defined
if ($allowedHosts == "") return; if ($allowedHosts == "") return;
@ -152,7 +152,7 @@ function logNewMessage($level, $message) {
$possibleLevels = array(LOG_NOTICE => 'NOTICE', LOG_WARNING => 'WARNING', LOG_ERR => 'ERROR'); $possibleLevels = array(LOG_NOTICE => 'NOTICE', LOG_WARNING => 'WARNING', LOG_ERR => 'ERROR');
if (!in_array($level, array_keys($possibleLevels))) StatusMessage('ERROR', 'Invalid log level!', $level); if (!in_array($level, array_keys($possibleLevels))) StatusMessage('ERROR', 'Invalid log level!', $level);
if (isset($_SESSION['cfgMain'])) $cfg = $_SESSION['cfgMain']; if (isset($_SESSION['cfgMain'])) $cfg = $_SESSION['cfgMain'];
else $cfg = new CfgMain(); else $cfg = new LAMCfgMain();
// check if logging is disabled // check if logging is disabled
if ($cfg->logDestination == 'NONE') return; if ($cfg->logDestination == 'NONE') return;
// check if log level is high enough // check if log level is high enough

2
lam/templates/config/conflogin.php
View File

@ -110,7 +110,7 @@ echo $_SESSION['header'];
<?php <?php
if (sizeof($files) > 0) { if (sizeof($files) > 0) {
echo "<select size=1 name=\"filename\">\n"; echo "<select size=1 name=\"filename\">\n";
$conf = new CfgMain(); $conf = new LAMCfgMain();
$defaultprofile = $conf->default; $defaultprofile = $conf->default;
for ($i = 0; $i < sizeof($files); $i++) { for ($i = 0; $i < sizeof($files); $i++) {
if ($files[$i] == $defaultprofile) echo ("<option selected>" . $files[$i] . "</option>\n"); if ($files[$i] == $defaultprofile) echo ("<option selected>" . $files[$i] . "</option>\n");

2
lam/templates/config/confmain.php
View File

@ -56,7 +56,7 @@ if (! $passwd) {
} }
if (!isset($_SESSION['conf_config']) && isset($_POST['filename'])) { if (!isset($_SESSION['conf_config']) && isset($_POST['filename'])) {
$_SESSION['conf_config'] = new Config($_POST['filename']); $_SESSION['conf_config'] = new LAMConfig($_POST['filename']);
} }
$conf = &$_SESSION['conf_config']; $conf = &$_SESSION['conf_config'];

2
lam/templates/config/mainlogin.php
View File

@ -46,7 +46,7 @@ if (isset($_SESSION["mainconf_password"])) unset($_SESSION["mainconf_password"])
// check if user entered a password // check if user entered a password
if (isset($_POST['passwd'])) { if (isset($_POST['passwd'])) {
$cfgMain = new CfgMain(); $cfgMain = new LAMCfgMain();
if (isset($_POST['passwd']) && ($_POST['passwd'] == $cfgMain->password)) { if (isset($_POST['passwd']) && ($_POST['passwd'] == $cfgMain->password)) {
$_SESSION["mainconf_password"] = $_POST['passwd']; $_SESSION["mainconf_password"] = $_POST['passwd'];
metaRefresh("mainmanage.php"); metaRefresh("mainmanage.php");

2
lam/templates/config/mainmanage.php
View File

@ -41,7 +41,7 @@ session_save_path("../../sess");
setlanguage(); setlanguage();
$cfg = new CfgMain(); $cfg = new LAMCfgMain();
// check if user is logged in // check if user is logged in
if (!isset($_SESSION["mainconf_password"]) || ($_SESSION["mainconf_password"] != $cfg->password)) { if (!isset($_SESSION["mainconf_password"]) || ($_SESSION["mainconf_password"] != $cfg->password)) {

10
lam/templates/config/profmanage.php
View File

@ -60,7 +60,7 @@ echo $_SESSION['header'];
<?php <?php
$cfg = new CfgMain(); $cfg = new LAMCfgMain();
// check if submit button was pressed // check if submit button was pressed
if ($_POST['submit']) { if ($_POST['submit']) {
// check master password // check master password
@ -78,7 +78,7 @@ if ($_POST['submit']) {
$file = is_file("../../config/" . $_POST['addprofile'] . ".conf"); $file = is_file("../../config/" . $_POST['addprofile'] . ".conf");
if ($file) { if ($file) {
// load as config and write new password // load as config and write new password
$conf = new Config($_POST['addprofile']); $conf = new LAMConfig($_POST['addprofile']);
$conf->Passwd = $_POST['addpassword']; $conf->Passwd = $_POST['addpassword'];
$conf->save(); $conf->save();
$msg = _("Created new profile."); $msg = _("Created new profile.");
@ -110,7 +110,7 @@ if ($_POST['submit']) {
// set new profile password // set new profile password
elseif ($_POST['action'] == "setpass") { elseif ($_POST['action'] == "setpass") {
if ($_POST['setpassword'] && $_POST['setpassword2'] && ($_POST['setpassword'] == $_POST['setpassword2'])) { if ($_POST['setpassword'] && $_POST['setpassword2'] && ($_POST['setpassword'] == $_POST['setpassword2'])) {
$config = new Config($_POST['setprofile']); $config = new LAMConfig($_POST['setprofile']);
$config->set_Passwd($_POST['setpassword']); $config->set_Passwd($_POST['setpassword']);
$config->save(); $config->save();
$msg = _("New password set successfully."); $msg = _("New password set successfully.");
@ -119,7 +119,7 @@ if ($_POST['submit']) {
} }
// set default profile // set default profile
elseif ($_POST['action'] == "setdefault") { elseif ($_POST['action'] == "setdefault") {
$config = new CfgMain(); $config = new LAMCfgMain();
$config->default = $_POST['defaultfilename']; $config->default = $_POST['defaultfilename'];
$config->save(); $config->save();
$msg = _("New default profile set successfully."); $msg = _("New default profile set successfully.");
@ -314,7 +314,7 @@ if (!isset($cfg->default) && !isset($cfg->password)) {
<select size=1 name="defaultfilename"> <select size=1 name="defaultfilename">
<?php <?php
$files = getConfigProfiles(); $files = getConfigProfiles();
$conf = new CfgMain(); $conf = new LAMCfgMain();
$defaultprofile = $conf->default; $defaultprofile = $conf->default;
for ($i = 0; $i < sizeof($files); $i++) { for ($i = 0; $i < sizeof($files); $i++) {
if ($files[$i] == $defaultprofile) echo ("<option selected>" . $files[$i] . "</option>\n"); if ($files[$i] == $defaultprofile) echo ("<option selected>" . $files[$i] . "</option>\n");

6
lam/templates/login.php
View File

@ -417,16 +417,16 @@ if(!empty($_POST['checklogin']))
} }
// Reload loginpage after a profile change // Reload loginpage after a profile change
elseif(!empty($_POST['profileChange'])) { elseif(!empty($_POST['profileChange'])) {
$_SESSION['config'] = new Config($_POST['profile']); // Recreate the config object with the submited $_SESSION['config'] = new LAMConfig($_POST['profile']); // Recreate the config object with the submited
display_LoginPage($_SESSION['config']); // Load login page display_LoginPage($_SESSION['config']); // Load login page
} }
// Load login page // Load login page
else else
{ {
$_SESSION['loggedIn'] = false; $_SESSION['loggedIn'] = false;
$default_Config = new CfgMain(); $default_Config = new LAMCfgMain();
$default_Profile = $default_Config->default; $default_Profile = $default_Config->default;
$_SESSION["config"] = new Config($default_Profile); // Create new Config object $_SESSION["config"] = new LAMConfig($default_Profile); // Create new Config object
$_SESSION["cfgMain"] = $default_Config; // Create new CfgMain object $_SESSION["cfgMain"] = $default_Config; // Create new CfgMain object
display_LoginPage($_SESSION["config"]); // Load Login page display_LoginPage($_SESSION["config"]); // Load Login page

4
lam/tests/conf-main-test.php
View File

@ -32,7 +32,7 @@ $Id$
/** configuration interface */ /** configuration interface */
include ("../lib/config.inc"); include ("../lib/config.inc");
$conf = new CfgMain(); $conf = new LAMCfgMain();
echo "<html><head><title></title><link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\"></head><body>"; echo "<html><head><title></title><link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\"></head><body>";
echo ("<b> Current Values</b><br><br>"); echo ("<b> Current Values</b><br><br>");
echo "<b>Password: </b>" . $conf->password . "<br>\n"; echo "<b>Password: </b>" . $conf->password . "<br>\n";
@ -51,7 +51,7 @@ $conf->save();
echo ("done<br>"); echo ("done<br>");
// at last all preferences are read from config.cfg and compared // at last all preferences are read from config.cfg and compared
echo ("Loading and comparing..."); echo ("Loading and comparing...");
$conf = new CfgMain(); $conf = new LAMCfgMain();
if ($conf->password != "123456") echo ("<br><font color=\"#FF0000\">Saving password failed!</font><br>"); if ($conf->password != "123456") echo ("<br><font color=\"#FF0000\">Saving password failed!</font><br>");
if ($conf->default != "lam") echo ("<br><font color=\"#FF0000\">Saving Default failed!</font><br>"); if ($conf->default != "lam") echo ("<br><font color=\"#FF0000\">Saving Default failed!</font><br>");
echo ("done<br>"); echo ("done<br>");

4
lam/tests/conf-test.php
View File

@ -32,7 +32,7 @@ $Id$
/** access to configuration functions */ /** access to configuration functions */
include ("../lib/config.inc"); include ("../lib/config.inc");
$conf = new Config('test'); $conf = new LAMConfig('test');
echo "<html><head><title></title><link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\"></head><body>"; echo "<html><head><title></title><link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\"></head><body>";
echo ("<br><br><big><b> Starting Test...</b></big><br><br>"); echo ("<br><br><big><b> Starting Test...</b></big><br><br>");
// now all preferences are loaded // now all preferences are loaded
@ -76,7 +76,7 @@ $conf->save();
echo ("done<br>"); echo ("done<br>");
// at last all preferences are read from lam.conf and compared // at last all preferences are read from lam.conf and compared
echo ("Loading and comparing..."); echo ("Loading and comparing...");
$conf2 = new Config('test'); $conf2 = new LAMConfig('test');
if ($conf2->get_ServerURL() != "ldap://123.345.678.123:777") echo ("<br><font color=\"#FF0000\">Saving ServerURL failed!</font><br>"); if ($conf2->get_ServerURL() != "ldap://123.345.678.123:777") echo ("<br><font color=\"#FF0000\">Saving ServerURL failed!</font><br>");
if ($conf2->get_cacheTimeout() != "33") echo ("<br><font color=\"#FF0000\">Saving Cache timeout failed!</font><br>"); if ($conf2->get_cacheTimeout() != "33") echo ("<br><font color=\"#FF0000\">Saving Cache timeout failed!</font><br>");
if ($conf2->get_Passwd() != "123456abcde") echo ("<br><font color=\"#FF0000\">Saving password failed!</font><br>"); if ($conf2->get_Passwd() != "123456abcde") echo ("<br><font color=\"#FF0000\">Saving password failed!</font><br>");