support jobs

This commit is contained in:
Roland Gruber 2015-06-12 18:28:25 +00:00
parent 6ec9809cb1
commit 75155bbf38
4 changed files with 76 additions and 3 deletions

View File

@ -187,6 +187,10 @@ $helpArray = array (
"Text" => _("This is a workaround for Active Directory. Enable it if you get messages about size limit exceeded.")), "Text" => _("This is a workaround for Active Directory. Enable it if you get messages about size limit exceeded.")),
"267" => array ("Headline" => _('Template'), "267" => array ("Headline" => _('Template'),
"Text" => _('Please select the template for the new server profile. You can either select an existing server profile or use one of the built-in templates.')), "Text" => _('Please select the template for the new server profile. You can either select an existing server profile or use one of the built-in templates.')),
"270" => array ("Headline" => _('Bind user and password'),
"Text" => _('Please enter the DN and password to use for all jobs.')),
"271" => array ("Headline" => _('Database type'),
"Text" => _('Please select the type of database to use for job data.')),
// 300 - 399 // 300 - 399
// profile editor, file upload // profile editor, file upload
"301" => array ("Headline" => _("RDN identifier"), "301" => array ("Headline" => _("RDN identifier"),

View File

@ -3,7 +3,7 @@
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2014 Roland Gruber Copyright (C) 2003 - 2015 Roland Gruber
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -515,13 +515,20 @@ class LAMConfig {
/** mail body for password reset mails */ /** mail body for password reset mails */
private $lamProMailText = ''; private $lamProMailText = '';
/** LDAP user for jobs */
private $jobsBindUser = null;
/** LDAP password for jobs */
private $jobsBindPassword = null;
/** database for jobs */
private $jobsDatabase = null;
/** List of all settings in config file */ /** List of all settings in config file */
private $settings = array("ServerURL", "useTLS", "followReferrals", 'pagedResults', "Passwd", "Admins", "treesuffix", private $settings = array("ServerURL", "useTLS", "followReferrals", 'pagedResults', "Passwd", "Admins", "treesuffix",
"defaultLanguage", "scriptPath", "scriptServer", "scriptRights", "cachetimeout", "defaultLanguage", "scriptPath", "scriptServer", "scriptRights", "cachetimeout",
"modules", "activeTypes", "types", "tools", "accessLevel", 'loginMethod', 'loginSearchSuffix', "modules", "activeTypes", "types", "tools", "accessLevel", 'loginMethod', 'loginSearchSuffix',
'loginSearchFilter', 'searchLimit', 'lamProMailFrom', 'lamProMailReplyTo', 'lamProMailSubject', 'loginSearchFilter', 'searchLimit', 'lamProMailFrom', 'lamProMailReplyTo', 'lamProMailSubject',
'lamProMailText', 'lamProMailIsHTML', 'lamProMailAllowAlternateAddress', 'httpAuthentication', 'loginSearchDN', 'lamProMailText', 'lamProMailIsHTML', 'lamProMailAllowAlternateAddress', 'httpAuthentication', 'loginSearchDN',
'loginSearchPassword', 'timeZone'); 'loginSearchPassword', 'timeZone', 'jobsBindUser', 'jobsBindPassword', 'jobsDatabase');
/** /**
@ -713,6 +720,9 @@ class LAMConfig {
if (!in_array("lamProMailIsHTML", $saved)) array_push($file_array, "\n\n# Password mail is HTML\n" . "lamProMailIsHTML: " . $this->lamProMailIsHTML . "\n"); if (!in_array("lamProMailIsHTML", $saved)) array_push($file_array, "\n\n# Password mail is HTML\n" . "lamProMailIsHTML: " . $this->lamProMailIsHTML . "\n");
if (!in_array("lamProMailAllowAlternateAddress", $saved)) array_push($file_array, "\n\n# Allow alternate address\n" . "lamProMailAllowAlternateAddress: " . $this->lamProMailAllowAlternateAddress . "\n"); if (!in_array("lamProMailAllowAlternateAddress", $saved)) array_push($file_array, "\n\n# Allow alternate address\n" . "lamProMailAllowAlternateAddress: " . $this->lamProMailAllowAlternateAddress . "\n");
if (!in_array("lamProMailText", $saved)) array_push($file_array, "\n\n# Password mail text\n" . "lamProMailText: " . $this->lamProMailText . "\n"); if (!in_array("lamProMailText", $saved)) array_push($file_array, "\n\n# Password mail text\n" . "lamProMailText: " . $this->lamProMailText . "\n");
if (!in_array("jobsBindPassword", $saved)) array_push($file_array, "\n" . "jobsBindPassword: " . $this->jobsBindPassword . "\n");
if (!in_array("jobsBindUser", $saved)) array_push($file_array, "\n" . "jobsBindUser: " . $this->jobsBindUser . "\n");
if (!in_array("jobsDatabase", $saved)) array_push($file_array, "\n" . "jobsDatabase: " . $this->jobsDatabase . "\n");
// check if all module settings were added // check if all module settings were added
$m_settings = array_keys($this->moduleSettings); $m_settings = array_keys($this->moduleSettings);
for ($i = 0; $i < sizeof($m_settings); $i++) { for ($i = 0; $i < sizeof($m_settings); $i++) {
@ -1594,6 +1604,60 @@ class LAMConfig {
$this->lamProMailText = implode(LAMConfig::LINE_SEPARATOR, explode("\r\n", $lamProMailText)); $this->lamProMailText = implode(LAMConfig::LINE_SEPARATOR, explode("\r\n", $lamProMailText));
} }
/**
* Returns the bind user for jobs.
*
* @return String $jobsBindUser bind user
*/
public function getJobsBindUser() {
return $this->jobsBindUser;
}
/**
* Sets the bind user for jobs.
*
* @param String $jobsBindUser bind user
*/
public function setJobsBindUser($jobsBindUser) {
$this->jobsBindUser = $jobsBindUser;
}
/**
* Returns the bind password for jobs.
*
* @return String $jobsBindPassword password
*/
public function getJobsBindPassword() {
return $this->jobsBindPassword;
}
/**
* Sets the bind password for jobs.
*
* @param String $jobsBindPassword password
*/
public function setJobsBindPassword($jobsBindPassword) {
$this->jobsBindPassword = $jobsBindPassword;
}
/**
* Returns the database type for jobs.
*
* @return String $jobsDatabase database type
*/
public function getJobsDatabase() {
return $this->jobsDatabase;
}
/**
* Sets the database type for jobs.
*
* @param String $jobsDatabase database type
*/
public function setJobsDatabase($jobsDatabase) {
$this->jobsDatabase = $jobsDatabase;
}
} }

View File

@ -85,7 +85,7 @@ class Ldap{
* @param string $user user name * @param string $user user name
* @param string $passwd password * @param string $passwd password
* @param boolean $allowAnonymous specifies if anonymous binds are allowed * @param boolean $allowAnonymous specifies if anonymous binds are allowed
* @return mixed if connect succeeds the server handle is returned, else false * @return mixed if connect succeeds the 0 is returned, else false or error number
*/ */
function connect($user, $passwd, $allowAnonymous=false) { function connect($user, $passwd, $allowAnonymous=false) {
// close any prior connection // close any prior connection

View File

@ -226,6 +226,11 @@ table.collapse {
background-position: 0px 0px !important; background-position: 0px 0px !important;
} }
.testButton {
background-image: url(../graphics/tests.png) !important;
background-position: 0px 0px !important;
}
.smallPadding span { .smallPadding span {
padding: 0.1em 0.4em !important; padding: 0.1em 0.4em !important;
} }