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

added new settings: scriptPath + scriptServer 

minor changes
This commit is contained in:
Roland Gruber 2003-05-12 17:52:54 +00:00
parent a8aa4d2596
commit fdd1695a19
6 changed files with 150 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lam/config/lam.conf_sample
View File

@ -64,3 +64,9 @@ maxlistentries: 30
# default language (a line from language.conf) # default language (a line from language.conf)
defaultLanguage: de_DE:iso639_de:Deutsch (Deutschland) defaultLanguage: de_DE:iso639_de:Deutsch (Deutschland)
# Path to external Script
scriptPath:
# Server of external Script
scriptServer:

6
lam/config/language.conf
View File

@ -7,4 +7,8 @@
en_GB:iso639_en:English (Britain) en_GB:iso639_en:English (Britain)
# German Language # German Language
de_DE:iso639_de:Deutsch (Deutschland) de_DE:iso639_de:Deutsch (Deutschland)
# German Language
fr_FR:iso639_fr:Francais (France)

98
lam/lib/config.inc
View File

@ -80,6 +80,11 @@ class Config {
// default language // default language
var $defaultLanguage; var $defaultLanguage;
// Path to external script and server where it is executed
// optional settings, may not be defined
var $scriptPath;
var $scriptServer;
// constructor, loads preferences from ../config/lam.conf // constructor, loads preferences from ../config/lam.conf
function Config() { function Config() {
$this->reload(); $this->reload();
@ -164,6 +169,14 @@ class Config {
$this->defaultLanguage = chop(substr($line, 17, strlen($line)-17)); $this->defaultLanguage = chop(substr($line, 17, strlen($line)-17));
continue; continue;
} }
if (substr($line, 0, 12) == "scriptPath: ") {
$this->scriptPath = chop(substr($line, 12, strlen($line)-12));
continue;
}
if (substr($line, 0, 14) == "scriptServer: ") {
$this->scriptServer = chop(substr($line, 14, strlen($line)-14));
continue;
}
} }
fclose($file); fclose($file);
} }
@ -186,7 +199,8 @@ class Config {
// booleans to check if value was already saved // booleans to check if value was already saved
$save_serverURL = $save_passwd = $save_admins = $save_suffusr = $save_suffgrp = $save_suffhst = $save_serverURL = $save_passwd = $save_admins = $save_suffusr = $save_suffgrp = $save_suffhst =
$save_minUID = $save_maxUID = $save_minGID = $save_maxGID = $save_minMach = $save_maxMach = $save_minUID = $save_maxUID = $save_minGID = $save_maxGID = $save_minMach = $save_maxMach =
$save_usrlstatrr = $save_grplstatrr = $save_hstlstatrr = $save_maxlstent = $save_deflang = False; $save_usrlstatrr = $save_grplstatrr = $save_hstlstatrr = $save_maxlstent = $save_deflang =
$save_scriptPath = $save_scriptServer = False;
$file = fopen($conffile, "r"); $file = fopen($conffile, "r");
$file_array = array(); $file_array = array();
while (!feof($file)) { while (!feof($file)) {
@ -281,18 +295,28 @@ class Config {
$save_deflang = True; $save_deflang = True;
continue; continue;
} }
if (substr($file_array[$i], 0, 12) == "scriptPath: ") {
$file_array[$i] = "scriptPath: " . $this->scriptPath . "\n";
$save_scriptPath = True;
continue;
}
if (substr($file_array[$i], 0, 14) == "scriptServer: ") {
$file_array[$i] = "scriptServer: " . $this->scriptServer . "\n";
$save_scriptServer = True;
continue;
}
} }
// check if we have to add new entries (e.g. if user upgraded LAM and has an old lam.conf) // check if we have to add new entries (e.g. if user upgraded LAM and has an old lam.conf)
if (!$save_serverURL == True) array_push($file_array, "\n\n# server address (e.g. ldap://localhost:389 or ldaps://localhost:636)\n" . "serverURL: " . $this->ServerURL); if (!$save_serverURL == True) array_push($file_array, "\n\n# server address (e.g. ldap://localhost:389 or ldaps://localhost:636)\n" . "serverURL: " . $this->ServerURL);
if (!$save_passwd == True) array_push($file_array, "\n\n# password to change these preferences via webfrontend\n" . "passwd: " . $this->Passwd); if (!$save_passwd == True) array_push($file_array, "\n\n# password to change these preferences via webfrontend\n" . "passwd: " . $this->Passwd);
if (!$save_admins == True) array_push($file_array, "\n\n# list of users who are allowed to use LDAP Account Manager\n" . if (!$save_admins == True) array_push($file_array, "\n\n# list of users who are allowed to use LDAP Account Manager\n" .
"# names have to be seperated by semicolons\n" . "# names have to be seperated by semicolons\n" .
"# e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org\n" . "admins: " . $this->Admins); "# e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org\n" . "admins: " . $this->Admins);
if (!$save_suffusr == True) array_push($file_array, "\n\n# suffix of users\n" . if (!$save_suffusr == True) array_push($file_array, "\n\n# suffix of users\n" .
"# e.g. ou=People,dc=yourdomain,dc=org\n" . "usersuffix: " . $this->Suff_users); "# e.g. ou=People,dc=yourdomain,dc=org\n" . "usersuffix: " . $this->Suff_users);
if (!$save_suffgrp == True) array_push($file_array, "\n\n# suffix of groups\n" . if (!$save_suffgrp == True) array_push($file_array, "\n\n# suffix of groups\n" .
"# e.g. ou=Groups,dc=yourdomain,dc=org\n" . "groupsuffix: " . $this->Suff_groups); "# e.g. ou=Groups,dc=yourdomain,dc=org\n" . "groupsuffix: " . $this->Suff_groups);
if (!$save_suffhst == True) array_push($file_array, "\n\n# suffix of Samba hosts\n" . if (!$save_suffhst == True) array_push($file_array, "\n\n# suffix of Samba hosts\n" .
"# e.g. ou=machines,dc=yourdomain,dc=org\n" . "hostsuffix: " . $this->Suff_hosts); "# e.g. ou=machines,dc=yourdomain,dc=org\n" . "hostsuffix: " . $this->Suff_hosts);
if (!$save_minUID == True) array_push($file_array, "\n\n# minimum UID number\n" . "minUID: " . $this->MinUID); if (!$save_minUID == True) array_push($file_array, "\n\n# minimum UID number\n" . "minUID: " . $this->MinUID);
if (!$save_maxUID == True) array_push($file_array, "\n\n# maximum UID number\n" . "maxUID: " . $this->MaxUID); if (!$save_maxUID == True) array_push($file_array, "\n\n# maximum UID number\n" . "maxUID: " . $this->MaxUID);
@ -308,6 +332,8 @@ class Config {
"\n# or individual ones (e.g. 'cn:Host Name')\n# values have to be seperated by semicolons\n" . "hostlistAttributes: " . $this->hostlistAttributes); "\n# or individual ones (e.g. 'cn:Host Name')\n# values have to be seperated by semicolons\n" . "hostlistAttributes: " . $this->hostlistAttributes);
if (!$save_maxlstent == True) array_push($file_array, "\n\n# maximum number of rows to show in user/group/host lists\n" . "maxlistentries: " . $this->maxlistentries); if (!$save_maxlstent == True) array_push($file_array, "\n\n# maximum number of rows to show in user/group/host lists\n" . "maxlistentries: " . $this->maxlistentries);
if (!$save_deflang == True) array_push($file_array, "\n\n# default language (a line from language.conf)\n" . "defaultLanguage: " . $this->defaultLanguage); if (!$save_deflang == True) array_push($file_array, "\n\n# default language (a line from language.conf)\n" . "defaultLanguage: " . $this->defaultLanguage);
if (!$save_scriptPath == True) array_push($file_array, "\n\n# Path to external Script\n" . "scriptPath: " . $this->scriptPath);
if (!$save_scriptServer == True) array_push($file_array, "\n\n# Server of external Script\n" . "scriptServer: " . $this->scriptServer);
$file = fopen($conffile, "w"); $file = fopen($conffile, "w");
if ($file) { if ($file) {
for ($i = 0; $i < sizeof($file_array); $i++) fputs($file, $file_array[$i]); for ($i = 0; $i < sizeof($file_array); $i++) fputs($file, $file_array[$i]);
@ -337,7 +363,9 @@ class Config {
echo _("<b>grouplistAttributes: </b>") . $this->grouplistAttributes . "<br>"; echo _("<b>grouplistAttributes: </b>") . $this->grouplistAttributes . "<br>";
echo _("<b>hostlistAttributes: </b>") . $this->hostlistAttributes . "<br>"; echo _("<b>hostlistAttributes: </b>") . $this->hostlistAttributes . "<br>";
echo _("<b>maxlistentries: </b>") . $this->maxlistentries . "<br>"; echo _("<b>maxlistentries: </b>") . $this->maxlistentries . "<br>";
echo _("<b>defaultLanguage: </b>") . $this->defaultLanguage; echo _("<b>defaultLanguage: </b>") . $this->defaultLanguage . "<br>";
echo _("<b>scriptPath: </b>") . $this->scriptPath . "<br>";
echo _("<b>scriptServer: </b>") . $this->scriptServer;
} }
// functions to read/write preferences // functions to read/write preferences
@ -350,7 +378,7 @@ class Config {
// sets the server address // sets the server address
function set_ServerURL($value) { function set_ServerURL($value) {
if (is_string($value)) $this->ServerURL = $value; if (is_string($value)) $this->ServerURL = $value;
else echo _("Config->set_ServerURL failed!"); else echo _("Config->set_ServerURL failed!") . " " . $value . " " . $value;
} }
// returns an array of string with all admin names // returns an array of string with all admin names
@ -370,7 +398,7 @@ class Config {
} }
if ($b) $this->Admins = $value; if ($b) $this->Admins = $value;
} }
else echo _("Config->set_Admins failed!"); else echo _("Config->set_Admins failed!") . " " . $value;
} }
// returns all admin users seperated by semicolons // returns all admin users seperated by semicolons
@ -384,7 +412,7 @@ class Config {
$this->Adminstring = $value; $this->Adminstring = $value;
$this->Admins = explode(";", $value); $this->Admins = explode(";", $value);
} }
else echo _("Config->set_Adminstring failed!"); else echo _("Config->set_Adminstring failed!") . " " . $value;
} }
// returns the password to access the preferences wizard // returns the password to access the preferences wizard
@ -395,7 +423,7 @@ class Config {
// sets the preferences wizard password // sets the preferences wizard password
function set_Passwd($value) { function set_Passwd($value) {
if (is_string($value)) $this->Passwd = $value; if (is_string($value)) $this->Passwd = $value;
else echo _("Config->set_Passwd failed!"); else echo _("Config->set_Passwd failed!") . " " . $value;
} }
// returns the LDAP suffix where users are saved // returns the LDAP suffix where users are saved
@ -406,7 +434,7 @@ class Config {
// sets the LDAP suffix where users are saved // sets the LDAP suffix where users are saved
function set_UserSuffix($value) { function set_UserSuffix($value) {
if (is_string($value)) $this->Suff_users = $value; if (is_string($value)) $this->Suff_users = $value;
else echo _("Config->set_UserSuffix failed!"); else echo _("Config->set_UserSuffix failed!") . " " . $value;
} }
// returns the LDAP suffix where groups are saved // returns the LDAP suffix where groups are saved
@ -417,7 +445,7 @@ class Config {
// sets the LDAP suffix where groups are saved // sets the LDAP suffix where groups are saved
function set_GroupSuffix($value) { function set_GroupSuffix($value) {
if (is_string($value)) $this->Suff_groups = $value; if (is_string($value)) $this->Suff_groups = $value;
else echo _("Config->set_GroupSuffix failed!"); else echo _("Config->set_GroupSuffix failed!") . " " . $value;
} }
// returns the LDAP suffix where hosts are saved // returns the LDAP suffix where hosts are saved
@ -428,7 +456,7 @@ class Config {
// sets the LDAP suffix where hosts are saved // sets the LDAP suffix where hosts are saved
function set_HostSuffix($value) { function set_HostSuffix($value) {
if (is_string($value)) $this->Suff_hosts = $value; if (is_string($value)) $this->Suff_hosts = $value;
else echo _("Config->set_HostSuffix failed!"); else echo _("Config->set_HostSuffix failed!") . " " . $value;
} }
// returns the minimum UID to use when creating new users // returns the minimum UID to use when creating new users
@ -439,7 +467,7 @@ class Config {
// sets the minimum UID to use when creating new users // sets the minimum UID to use when creating new users
function set_minUID($value) { function set_minUID($value) {
if (is_numeric($value)) $this->MinUID = $value; if (is_numeric($value)) $this->MinUID = $value;
else echo _("Config->set_minUID failed!"); else echo _("Config->set_minUID failed!") . " " . $value;
} }
// returns the maximum UID to use when creating new users // returns the maximum UID to use when creating new users
@ -450,7 +478,7 @@ class Config {
// sets the maximum UID to use when creating new users // sets the maximum UID to use when creating new users
function set_maxUID($value) { function set_maxUID($value) {
if (is_numeric($value)) $this->MaxUID = $value; if (is_numeric($value)) $this->MaxUID = $value;
else echo _("Config->set_maxUID failed!"); else echo _("Config->set_maxUID failed!") . " " . $value;
} }
// returns the minimum GID to use when creating new groups // returns the minimum GID to use when creating new groups
@ -461,7 +489,7 @@ class Config {
// sets the minimum GID to use when creating new groups // sets the minimum GID to use when creating new groups
function set_minGID($value) { function set_minGID($value) {
if (is_numeric($value)) $this->MinGID = $value; if (is_numeric($value)) $this->MinGID = $value;
else echo _("Config->set_minGID failed!"); else echo _("Config->set_minGID failed!") . " " . $value;
} }
// returns the maximum GID to use when creating new groups // returns the maximum GID to use when creating new groups
@ -472,7 +500,7 @@ class Config {
// sets the maximum GID to use when creating new groups // sets the maximum GID to use when creating new groups
function set_maxGID($value) { function set_maxGID($value) {
if (is_numeric($value)) $this->MaxGID = $value; if (is_numeric($value)) $this->MaxGID = $value;
else echo _("Config->set_maxGID failed!"); else echo _("Config->set_maxGID failed!") . " " . $value;
} }
// returns the minimum UID to use when creating new Samba hosts // returns the minimum UID to use when creating new Samba hosts
@ -483,7 +511,7 @@ class Config {
// sets the minimum UID to use when creating new Samba hosts // sets the minimum UID to use when creating new Samba hosts
function set_minMachine($value) { function set_minMachine($value) {
if (is_numeric($value)) $this->MinMachine = $value; if (is_numeric($value)) $this->MinMachine = $value;
else echo _("Config->set_minMachine failed!"); else echo _("Config->set_minMachine failed!") . " " . $value;
} }
// returns the maximum UID to use when creating new Samba hosts // returns the maximum UID to use when creating new Samba hosts
@ -494,7 +522,7 @@ class Config {
// sets the maximum UID to use when creating new Samba hosts // sets the maximum UID to use when creating new Samba hosts
function set_maxMachine($value) { function set_maxMachine($value) {
if (is_numeric($value)) $this->MaxMachine = $value; if (is_numeric($value)) $this->MaxMachine = $value;
else echo _("Config->set_maxMachine failed!"); else echo _("Config->set_maxMachine failed!") . " " . $value;
} }
// returns the list of attributes to show in user list // returns the list of attributes to show in user list
@ -505,7 +533,7 @@ class Config {
// sets the list of attributes to show in user list // sets the list of attributes to show in user list
function set_userlistAttributes($value) { function set_userlistAttributes($value) {
if (is_string($value)) $this->userlistAttributes = $value; if (is_string($value)) $this->userlistAttributes = $value;
else echo _("Config->set_userlistAttributes failed!"); else echo _("Config->set_userlistAttributes failed!") . " " . $value;
} }
// returns the list of attributes to show in group list // returns the list of attributes to show in group list
@ -516,7 +544,7 @@ class Config {
// sets the list of attributes to show in group list // sets the list of attributes to show in group list
function set_grouplistAttributes($value) { function set_grouplistAttributes($value) {
if (is_string($value)) $this->grouplistAttributes = $value; if (is_string($value)) $this->grouplistAttributes = $value;
else echo _("Config->set_grouplistAttributes failed!"); else echo _("Config->set_grouplistAttributes failed!") . " " . $value;
} }
// returns the list of attributes to show in host list // returns the list of attributes to show in host list
@ -527,7 +555,7 @@ class Config {
// sets the list of attributes to show in host list // sets the list of attributes to show in host list
function set_hostlistAttributes($value) { function set_hostlistAttributes($value) {
if (is_string($value)) $this->hostlistAttributes = $value; if (is_string($value)) $this->hostlistAttributes = $value;
else echo _("Config->set_hostlistAttributes failed!"); else echo _("Config->set_hostlistAttributes failed!") . " " . $value;
} }
/** /**
@ -560,7 +588,31 @@ class Config {
// sets the default language string // sets the default language string
function set_defaultLanguage($value) { function set_defaultLanguage($value) {
if (is_string($value)) $this->defaultLanguage = $value; if (is_string($value)) $this->defaultLanguage = $value;
else echo _("Config->set_defaultLanguage failed!"); else echo _("Config->set_defaultLanguage failed!") . " " . $value;
}
// returns the path to the external script
function get_scriptPath() {
return $this->scriptPath;
}
// sets the path to the external script
function set_scriptPath($value) {
if (!$value) $value = ""; // optional parameter
if (is_string($value) && eregi("^()|(/([a-z]|[0-9]|-|_|/)*)$", $value)) $this->scriptPath = $value;
else echo _("Config->set_scriptPath failed!") . " " . $value;
}
// returns the server of the external script
function get_scriptServer() {
return $this->scriptServer;
}
// sets the server of the external script
function set_scriptServer($value) {
if (!$value) $value = ""; // optional parameter
if (is_string($value)) $this->scriptServer = $value;
else echo _("Config->set_scriptServer failed!") . " " . $value;
} }

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

@ -55,9 +55,12 @@ if ($_POST['back'] || $_POST['submitconf']){
if ($_POST['hstlstattr']) $hstlstattr = $_POST['hstlstattr']; if ($_POST['hstlstattr']) $hstlstattr = $_POST['hstlstattr'];
if ($_POST['maxlistentries']) $maxlistentries = $_POST['maxlistentries']; if ($_POST['maxlistentries']) $maxlistentries = $_POST['maxlistentries'];
if ($_POST['language']) $language = $_POST['language']; if ($_POST['language']) $language = $_POST['language'];
if ($_POST['scriptpath']) $scriptpath = $_POST['scriptpath'];
if ($_POST['scriptserver']) $scriptserver = $_POST['scriptserver'];
session_register('passwd', 'passwd1', 'passwd2', 'serverurl', 'admins', 'suffusers', session_register('passwd', 'passwd1', 'passwd2', 'serverurl', 'admins', 'suffusers',
'suffgroups', 'suffhosts', 'minUID', 'maxUID', 'minGID', 'maxGID', 'minMach', 'suffgroups', 'suffhosts', 'minUID', 'maxUID', 'minGID', 'maxGID', 'minMach',
'maxMach', 'usrlstattr', 'grplstattr', 'hstlstattr', 'maxlistentries', 'language'); 'maxMach', 'usrlstattr', 'grplstattr', 'hstlstattr', 'maxlistentries', 'language',
'scriptpath', 'scriptserver');
echo("<meta http-equiv=\"refresh\" content=\"0; URL=confsave.php\">"); echo("<meta http-equiv=\"refresh\" content=\"0; URL=confsave.php\">");
} }
// back to login // back to login
@ -226,15 +229,16 @@ echo ("<td><p align=\"left\">".
_("This is the maximum count of entries which are displayed on one page of the user/host/group lists."). _("This is the maximum count of entries which are displayed on one page of the user/host/group lists.").
"</p></td></tr>\n"); "</p></td></tr>\n");
echo ("</table>"); echo ("</table>\n");
echo ("</fieldset>"); echo ("</fieldset>\n");
echo ("<br>"); echo ("<br>\n");
echo ("<fieldset><legend><b>" . _("Language settings") . "</b></legend>"); echo ("<fieldset><legend><b>" . _("Language settings") . "</b></legend>\n");
echo ("<table align=\"left\" border=\"0\">"); echo ("<table align=\"left\" border=\"0\">\n");
// language // language
echo ("<tr><td>"); echo ("<tr>");
echo ("<td><b>" . _("Default Language") . "</b></td>\n<td>");
// read available languages // read available languages
$languagefile = "../../config/language.conf"; $languagefile = "../../config/language.conf";
if(is_file($languagefile)) if(is_file($languagefile))
@ -244,8 +248,8 @@ if(is_file($languagefile))
while(!feof($file)) while(!feof($file))
{ {
$line = fgets($file, 1024); $line = fgets($file, 1024);
if($line == "\n" || $line[0] == "#") continue; // ignore comment and empty lines if($line == "\n" || $line[0] == "#" || $line == "") continue; // ignore comment and empty lines
$languages[$i] = $line; $languages[$i] = chop($line);
$i++; $i++;
} }
fclose($file); fclose($file);
@ -253,29 +257,43 @@ if(is_file($languagefile))
echo ("<select name=\"language\">"); echo ("<select name=\"language\">");
for ($i = 0; $i < sizeof($languages); $i++) { for ($i = 0; $i < sizeof($languages); $i++) {
$entry = explode(":", $languages[$i]); $entry = explode(":", $languages[$i]);
if ($_SESSION['config']->get_defaultLanguage() != $languages[$i]) echo("<option value=\"" . $languages[$i] . "\">" . $entry[2] . "</option>"); if ($_SESSION['config']->get_defaultLanguage() != $languages[$i]) echo("<option value=\"" . $languages[$i] . "\">" . $entry[2] . "</option>\n");
else echo("<option selected value=\"" . $languages[$i] . "\">" . $entry[2] . "</option>"); else echo("<option selected value=\"" . $languages[$i] . "\">" . $entry[2] . "</option>\n");
} }
echo ("</select>"); echo ("</select>\n");
} }
else else
{ {
echo _("Unable to load available languages. For further instructions please contact the Admin of this site."); echo _("Unable to load available languages. For further instructions please contact the Admin of this site.\n");
} }
echo ("</td></tr>\n");
echo ("</td></tr>");
echo ("</table>\n"); echo ("</table>\n");
echo ("</fieldset>"); echo ("</fieldset>\n");
echo ("<br>"); echo ("<br>\n");
echo ("<fieldset><legend><b>" . _("Security settings") . "</b></legend>"); echo ("<fieldset><legend><b>" . _("Script settings") . "</b></legend>\n");
echo ("<table align=\"left\" border=\"0\">"); echo ("<table align=\"left\" border=\"0\">\n");
// script settings
echo ("<tr><td><p align=\"right\"><b>".
_("Path to external script") . ": </b></p></td>".
"<td><input size=50 type=\"text\" name=\"scriptpath\" value=\"" . $conf->get_scriptPath() . "\"></td></tr>\n");
echo ("<tr><td><p align=\"right\"><b>".
_("Server of external script") . ": </b></p></td>".
"<td><input size=50 type=\"text\" name=\"scriptserver\" value=\"" . $conf->get_scriptServer() . "\"></td></tr>\n");
echo ("</table>\n");
echo ("</fieldset>\n");
echo ("<br>\n");
echo ("<fieldset><legend><b>" . _("Security settings") . "</b></legend>\n");
echo ("<table align=\"left\" border=\"0\">\n");
// new password // new password
echo ("<tr><td bgcolor=\"red\" align=\"right\"><b>". echo ("<tr><td bgcolor=\"red\" align=\"right\"><b>".
_("New Password") . ": </b></td>". _("New Password") . ": </b></td>".
"<td bgcolor=\"red\" align=\"left\"><input type=\"password\" name=\"pass1\"></td></tr>"); "<td bgcolor=\"red\" align=\"left\"><input type=\"password\" name=\"pass1\"></td></tr>\n");
// reenter password // reenter password
echo ("<tr><td bgcolor=\"red\" align=\"right\"><b>". echo ("<tr><td bgcolor=\"red\" align=\"right\"><b>".
_("Reenter Password") . ": </b></td>". _("Reenter Password") . ": </b></td>".
@ -291,7 +309,7 @@ echo ("<table align=\"left\" border=\"0\">");
echo ("<tr><td align=\"left\"><pre>". echo ("<tr><td align=\"left\"><pre>".
"<input type=\"submit\" name=\"submitconf\" value=\"" . _("Submit") . "\">". "<input type=\"submit\" name=\"submitconf\" value=\"" . _("Submit") . "\">".
"<input type=\"reset\" name=\"resetconf\" value=\"" . _("Reset") . "\">". "<input type=\"reset\" name=\"resetconf\" value=\"" . _("Reset") . "\">".
"<input type=\"submit\" name=\"back\" value=\"" . _("Abort") . "\""); "<input type=\"submit\" name=\"back\" value=\"" . _("Abort") . "\"\n");
echo ("></pre></td></tr>\n"); echo ("></pre></td></tr>\n");

16
lam/templates/config/confsave.php
View File

@ -51,6 +51,8 @@ if ($_SESSION['grplstattr']) $grplstattr = $_SESSION['grplstattr'];
if ($_SESSION['hstlstattr']) $hstlstattr = $_SESSION['hstlstattr']; if ($_SESSION['hstlstattr']) $hstlstattr = $_SESSION['hstlstattr'];
if ($_SESSION['maxlistentries']) $maxlistentries = $_SESSION['maxlistentries']; if ($_SESSION['maxlistentries']) $maxlistentries = $_SESSION['maxlistentries'];
if ($_SESSION['language']) $language = $_SESSION['language']; if ($_SESSION['language']) $language = $_SESSION['language'];
if ($_SESSION['scriptpath']) $scriptpath = $_SESSION['scriptpath'];
if ($_SESSION['scriptserver']) $scriptserver = $_SESSION['scriptserver'];
// check if password is correct // check if password is correct
// if not: load login page // if not: load login page
@ -139,6 +141,12 @@ if (chop($maxlistentries) == "") {
exit; exit;
} }
if (chop($language) == "") {
echo _("<font color=\"red\"><b>" . _("Language is not defined!") . "</b></font>");
echo ("\n<br><br><br><a href=\"javascript:history.back()\">" . _("Back to preferences...") . "</a>");
exit;
}
// set new preferences // set new preferences
$conf->set_ServerURL($serverurl); $conf->set_ServerURL($serverurl);
$conf->set_Adminstring($admins); $conf->set_Adminstring($admins);
@ -156,6 +164,11 @@ $conf->set_grouplistAttributes($grplstattr);
$conf->set_hostlistAttributes($hstlstattr); $conf->set_hostlistAttributes($hstlstattr);
$conf->set_MaxListEntries($maxlistentries); $conf->set_MaxListEntries($maxlistentries);
$conf->set_defaultLanguage($language); $conf->set_defaultLanguage($language);
// optional
if ($_SESSION['scriptpath']) $conf->set_scriptpath($scriptpath);
else $conf->set_scriptpath("");
if ($_SESSION['scriptserver']) $conf->set_scriptserver($scriptserver);
else $conf->set_scriptserver("");
@ -194,4 +207,7 @@ unset($_SESSION['grplstattr']);
unset($_SESSION['hstlstattr']); unset($_SESSION['hstlstattr']);
unset($_SESSION['maxlistentries']); unset($_SESSION['maxlistentries']);
unset($_SESSION['language']); unset($_SESSION['language']);
unset($_SESSION['scriptpath']);
unset($_SESSION['scriptserver']);
?> ?>

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

@ -48,6 +48,8 @@ $grouplistAttributes = $conf->get_grouplistAttributes();
$hostlistAttributes = $conf->get_hostlistAttributes(); $hostlistAttributes = $conf->get_hostlistAttributes();
$maxlistentries = $conf->get_maxlistentries(); $maxlistentries = $conf->get_maxlistentries();
$defaultlanguage = $conf->get_defaultlanguage(); $defaultlanguage = $conf->get_defaultlanguage();
$scriptpath = $conf->get_scriptPath();
$scriptServer = $conf->get_scriptServer();
echo ("done<br>"); echo ("done<br>");
// next we modify them and save lam.conf // next we modify them and save lam.conf
echo ("Changing preferences..."); echo ("Changing preferences...");
@ -69,6 +71,8 @@ $conf->set_grouplistAttributes("#gidNumber;#cn;#memberUID");
$conf->set_hostlistAttributes("#cn;#uid;#description"); $conf->set_hostlistAttributes("#cn;#uid;#description");
$conf->set_maxlistentries("54"); $conf->set_maxlistentries("54");
$conf->set_defaultlanguage("de_AT:iso639_de:Deutsch (Oesterreich)"); $conf->set_defaultlanguage("de_AT:iso639_de:Deutsch (Oesterreich)");
$conf->set_scriptPath("/var/www/lam/lib/script");
$conf->set_scriptServer("127.0.0.1");
$conf->save(); $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
@ -94,6 +98,8 @@ if ($conf->get_grouplistAttributes() != "#gidNumber;#cn;#memberUID") echo ("<br>
if ($conf->get_hostlistAttributes() != "#cn;#uid;#description") echo ("<br><font color=\"#FF0000\">Saving hostlistAttributes failed!</font><br>"); if ($conf->get_hostlistAttributes() != "#cn;#uid;#description") echo ("<br><font color=\"#FF0000\">Saving hostlistAttributes failed!</font><br>");
if ($conf->get_maxlistentries() != "54") echo ("<br><font color=\"#FF0000\">Saving maxlistentries failed!</font><br>"); if ($conf->get_maxlistentries() != "54") echo ("<br><font color=\"#FF0000\">Saving maxlistentries failed!</font><br>");
if ($conf->get_defaultlanguage() != "de_AT:iso639_de:Deutsch (Oesterreich)") echo ("<br><font color=\"#FF0000\">Saving default language failed!</font><br>"); if ($conf->get_defaultlanguage() != "de_AT:iso639_de:Deutsch (Oesterreich)") echo ("<br><font color=\"#FF0000\">Saving default language failed!</font><br>");
if ($conf->get_scriptPath() != "/var/www/lam/lib/script") echo ("<br><font color=\"#FF0000\">Saving script path failed!</font><br>");
if ($conf->get_scriptServer() != "127.0.0.1") echo ("<br><font color=\"#FF0000\">Saving script server failed!</font><br>");
echo ("done<br>"); echo ("done<br>");
// restore old values // restore old values
echo ("Restoring old preferences..."); echo ("Restoring old preferences...");
@ -115,6 +121,8 @@ $conf->set_grouplistAttributes($grouplistAttributes);
$conf->set_hostlistAttributes($hostlistAttributes); $conf->set_hostlistAttributes($hostlistAttributes);
$conf->set_maxlistentries($maxlistentries); $conf->set_maxlistentries($maxlistentries);
$conf->set_defaultLanguage($defaultlanguage); $conf->set_defaultLanguage($defaultlanguage);
$conf->set_scriptPath($scriptpath);
$conf->set_scriptServer($scriptserver);
$conf->save(); $conf->save();
echo ("done<br>"); echo ("done<br>");
// finished // finished