extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 00:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

ldap fixes

Browse Source
This commit is contained in:
skeeter 2001-03-10 20:13:52 +00:00
parent 90febe7d8f
commit 2a1003204a
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
setup/ldap.php
View File

@ -12,43 +12,42 @@
/* $Id$ */ /* $Id$ */
$phpgw_info["flags"] = array( $phpgw_info["flags"] = array(
"noheader" => True, 'noheader' => True,
"nonavbar" => True, 'nonavbar' => True,
"currentapp"=> "home", 'currentapp' => 'home',
"noapi" => True 'noapi' => True
); );
include("../header.inc.php"); include('../header.inc.php');
include("./inc/functions.inc.php"); include('./inc/functions.inc.php');
// Authorize the user to use setup app and load the database // Authorize the user to use setup app and load the database
if (!$phpgw_setup->auth("Config")){ if (!$phpgw_setup->auth('Config')){
Header("Location: index.php"); Header('Location: index.php');
exit; exit;
} }
// Does not return unless user is authorized // Does not return unless user is authorized
class phpgw { class phpgw {
var $common; var $common;
} }
$phpgw = new phpgw; $phpgw = new phpgw;
$phpgw->common = CreateObject("phpgwapi.common"); $phpgw->common = CreateObject('phpgwapi.common');
$common = $phpgw->common; $common = $phpgw->common;
$phpgw_setup->loaddb(); $phpgw_setup->loaddb();
$phpgw_info["server"]["auth_type"] = "ldap"; $phpgw_info['server']['auth_type'] = 'ldap';
$acct = CreateObject("phpgwapi.accounts"); $acct = CreateObject('phpgwapi.accounts');
$applications = CreateObject("phpgwapi.applications"); $applications = CreateObject('phpgwapi.applications');
$phpgw_setup->db->query("select config_name,config_value from phpgw_config where config_name like 'ldap%'",__LINE__,__FILE__); $phpgw_setup->db->query("select config_name,config_value from phpgw_config where config_name like 'ldap%'",__LINE__,__FILE__);
while ($phpgw_setup->db->next_record()) { while ($phpgw_setup->db->next_record()) {
$config[$phpgw_setup->db->f("config_name")] = $phpgw_setup->db->f("config_value"); $config[$phpgw_setup->db->f('config_name')] = $phpgw_setup->db->f('config_value');
} }
$phpgw_info["server"]["ldap_host"] = $config["ldap_host"]; $phpgw_info['server']['ldap_host'] = $config['ldap_host'];
$phpgw_info["server"]["ldap_context"] = $config["ldap_context"]; $phpgw_info['server']['ldap_context'] = $config['ldap_context'];
$phpgw_info["server"]["ldap_root_dn"] = $config["ldap_root_dn"]; $phpgw_info['server']['ldap_root_dn'] = $config['ldap_root_dn'];
$phpgw_info["server"]["ldap_root_pw"] = $config["ldap_root_pw"]; $phpgw_info['server']['ldap_root_pw'] = $config['ldap_root_pw'];
// First, see if we can connect to the LDAP server, if not send `em back to config.php with an // First, see if we can connect to the LDAP server, if not send `em back to config.php with an
// error message. // error message.
@ -59,35 +58,35 @@
} }
if ($noldapconnection) { if ($noldapconnection) {
Header("Location: config.php?error=badldapconnection"); Header('Location: config.php?error=badldapconnection');
exit; exit;
} }
$sr = ldap_search($ldap,$config["ldap_context"],"(|(uid=*))",array("sn","givenname","uid","uidnumber")); $sr = ldap_search($ldap,$config['ldap_context'],'(|(uid=*))',array('sn','givenname','uid','uidnumber'));
$info = ldap_get_entries($ldap, $sr); $info = ldap_get_entries($ldap, $sr);
for ($i=0; $i<$info["count"]; $i++) { for ($i=0; $i<$info['count']; $i++) {
if (! $phpgw_info["server"]["global_denied_users"][$info[$i]["uid"][0]]) { if (! $phpgw_info['server']['global_denied_users'][$info[$i]['uid'][0]]) {
$account_info[$i]["account_id"] = $info[$i]["uidnumber"][0]; $account_info[$i]['account_id'] = $info[$i]['uidnumber'][0];
$account_info[$i]["account_lid"] = $info[$i]["uid"][0]; $account_info[$i]['account_lid'] = $info[$i]['uid'][0];
$account_info[$i]["account_firstname"] = $info[$i]["givenname"][0]; $account_info[$i]['account_firstname'] = $info[$i]['givenname'][0];
$account_info[$i]["account_lastname"] = $info[$i]["sn"][0]; $account_info[$i]['account_lastname'] = $info[$i]['sn'][0];
} }
} }
$phpgw_setup->db->query("select app_name,app_title from phpgw_applications where app_enabled != '0' and " $phpgw_setup->db->query("select app_name,app_title from phpgw_applications where app_enabled != '0' and "
. "app_name != 'administration'",__LINE__,__FILE__); . "app_name != 'administration'",__LINE__,__FILE__);
while ($phpgw_setup->db->next_record()) { while ($phpgw_setup->db->next_record()) {
$apps[$phpgw_setup->db->f("app_name")] = $phpgw_setup->db->f("app_title"); $apps[$phpgw_setup->db->f('app_name')] = $phpgw_setup->db->f('app_title');
} }
if ($submit) { if ($submit) {
if (! count($admins)) { if (! count($admins)) {
$error = "<br>You must select at least 1 admin"; $error = '<br>You must select at least 1 admin';
} }
if (! count($s_apps)) { if (! count($s_apps)) {
$error .= "<br>You must select at least 1 application"; $error .= '<br>You must select at least 1 application';
} }
if (! $error) { if (! $error) {
@ -114,33 +113,33 @@
while ($account = each($account_info)) { while ($account = each($account_info)) {
// do some checks before we try to import the data // do some checks before we try to import the data
if (!empty($account[1]["account_id"]) && !empty($account[1]["account_lid"])) if (!empty($account[1]['account_id']) && !empty($account[1]['account_lid']))
$accounts = CreateObject("phpgwapi.accounts",$account[1]["account_id"]); $accounts = CreateObject('phpgwapi.accounts',$account[1]['account_id']);
$accounts->db = $phpgw_setup->db; $accounts->db = $phpgw_setup->db;
$acl = CreateObject("phpgwapi.acl",intval($account[1]["account_id"])); $acl = CreateObject('phpgwapi.acl',intval($account[1]['account_id']));
$acl->db = $phpgw_setup->db; $acl->db = $phpgw_setup->db;
$acl->read_repository(); $acl->read_repository();
// Only give them admin if we asked for them to have it // Only give them admin if we asked for them to have it
for ($a=0;$a<count($admins);$a++) { for ($a=0;$a<count($admins);$a++) {
if ($admins[$a] == $account[1]["account_id"]) { if ($admins[$a] == $account[1]['account_id']) {
$acl->add('admin','run',1); $acl->add('admin','run',1);
} }
} }
// Check if the account is already there // Check if the account is already there
$acct_exist = $accounts->exists($account[1]["account_id"]); $acct_exist = $accounts->exists($account[1]['account_id']);
if(!$acct_exist && $account[1]["account_id"]) { if(!$acct_exist && $account[1]['account_id']) {
$accounts->create('u', $account[1]["account_lid"], 'x', $accounts->create('u', $account[1]['account_lid'], 'x',
$account[1]["account_firstname"], $account[1]["account_lastname"], $account[1]['account_firstname'], $account[1]['account_lastname'],
'A',$account[1]["account_id"] 'A',$account[1]['account_id']
); );
} }
// Now make them a member of the 'Default' group // Now make them a member of the 'Default' group
$acl->add("phpgw_group",$defaultgroupid,1); $acl->add('phpgw_group',$defaultgroupid,1);
$acl->save_repository(); $acl->save_repository();
} }
$setup_complete = True; $setup_complete = True;
@ -152,7 +151,7 @@
$phpgw_setup->show_header(); $phpgw_setup->show_header();
if ($error) { if ($error) {
echo "<br><center><b>Error:</b> $error</center>"; echo '<br><center><b>Error:</b> '.$error.'</center>';
} }
if ($setup_complete) { if ($setup_complete) {
@ -181,8 +180,8 @@
<select name="admins[]" multiple size="5"> <select name="admins[]" multiple size="5">
<?php <?php
while ($account = each($account_info)) { while ($account = each($account_info)) {
echo '<option value="' . $account[1]["account_id"] . '">' echo '<option value="' . $account[1]['account_id'] . '">'
. $common->display_fullname($account[1]["account_lid"],$account[1]["account_firstname"],$account[1]["account_lastname"]) . $common->display_fullname($account[1]['account_lid'],$account[1]['account_firstname'],$account[1]['account_lastname'])
. '</option>'; . '</option>';
echo "\n"; echo "\n";
} }