Changeset 526 for trunk/jabberit_messenger/inc
- Timestamp:
- 10/13/08 11:53:05 (16 years ago)
- Location:
- trunk/jabberit_messenger/inc
- Files:
-
- 5 edited
-
class.ldap_im.inc.php (modified) (3 diffs)
-
class.uiconforganization.inc.php (modified) (1 diff)
-
class.ujabber.inc.php (modified) (3 diffs)
-
jabberit_sessions.inc.php (modified) (1 diff)
-
login.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/jabberit_messenger/inc/class.ldap_im.inc.php
r519 r526 61 61 $filter = "(&(phpgwaccounttype=u)(|".$uidnumber.")(".$search ."))"; 62 62 $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto"); 63 // SERPRO 64 //$justthese = array("uid","uidNumber","cn","mail","description","phpgwAccountVisible","dn","jpegPhoto"); 63 65 $search = ldap_search($this->ldap,$this->ldap_context,$filter,$justthese, 0, $this->max_result + 1); 64 66 $entry1 = ldap_get_entries($this->ldap,$search); … … 83 85 $result['uid'] = @ldap_get_values($this->ldap, $entry, 'uid'); 84 86 $result['cn'] = @ldap_get_values($this->ldap, $entry, 'cn'); 87 // SERPRO 88 //$result['description'] = @ldap_get_values($this->ldap, $entry, 'description'); 85 89 86 90 foreach ( $result as $key => $value ) … … 99 103 $_SESSION['phpgw_info']['jabberit_messenger']['photo'][trim($result_user[$i]['uid'])] = $photo[0]; 100 104 } 105 106 $organization = explode(",", $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit']); 107 108 if(is_array($organization)) 109 { 110 foreach($organization as $attr) 111 { 112 $tmp = explode(";",$attr); 113 if( strtolower(trim($tmp[0])) == strtolower(trim($result_user[$i]['dn'])) ) 114 { 115 switch(strtolower(trim($tmp[1]))) 116 { 117 case "mail" : 118 $uid = $result_user[$i]['mail']; 119 $uid = substr($uid,0,strpos($uid,"@")); 120 $result_user[$i]['uid'] = $uid; 121 break; 122 123 case "description" : 124 // SERPRO 125 // parte antes do arroba; 126 $result_user[$i]['uid'] = $result_user[$i]['description']; 127 break; 128 } 129 } 130 } 131 } 132 101 133 $i++; 102 134 } 103 135 $entry = ldap_next_entry($this->ldap,$entry); 104 136 } 137 105 138 return $result_user; 106 139 } -
trunk/jabberit_messenger/inc/class.uiconforganization.inc.php
r519 r526 60 60 echo parse_navbar(); 61 61 62 $options_attributes = array('uid','mail' );62 $options_attributes = array('uid','mail','description'); 63 63 $attributes .= "<option value='-1'>-- ".lang('Choice attribute')." --</option>"; 64 64 foreach($options_attributes as $tmp ) -
trunk/jabberit_messenger/inc/class.ujabber.inc.php
r459 r526 22 22 23 23 $this->jabber = new Jabber(); 24 $this->jabber->username = $_SESSION['phpgw_info']['jabberit_messenger']['user']; 24 25 $organization = explode(",", $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit']); 26 $organization_user = $_SESSION['phpgw_info']['jabberit_messenger']['account_dn']; 27 $organization_user = substr($organization_user, strpos($organization_user,"ou=") + 3 , strlen($organization_user)); 28 $organization_user = substr($organization_user, 0, strpos($organization_user, ",")); 29 30 // Default para autenticação é o UID; 31 $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user']; 32 33 if(is_array($organization)) 34 { 35 foreach($organization as $attr) 36 { 37 $tmp = explode(";",$attr); 38 if( strtolower(trim($tmp[0])) == strtolower(trim($organization_user))) 39 { 40 switch(strtolower(trim($tmp[1]))) 41 { 42 case "mail" : 43 $uid = $_SESSION['phpgw_info']['jabberit_messenger']['mail']; 44 $uid = substr($uid,0,strpos($uid,"@")); 45 break; 46 47 case "description" : 48 // SERPRO 49 // parte antes do arroba; 50 // Informe aqui a parte da sessão correspondente; 51 $uid = "description"; 52 break; 53 } 54 } 55 } 56 } 57 58 $this->jabber->username = $uid; 25 59 $this->jabber->password = $_SESSION['phpgw_info']['jabberit_messenger']['passwd']; 26 60 $this->jabber->server = $_SESSION['phpgw_info']['jabberit_messenger']['name_jabberit']; … … 57 91 $name = $pNewUser['name']; 58 92 $group = $pNewUser['group']; 59 93 60 94 if($this->jabber->RosterAddUser($jid,$id,$name,$group)) 61 95 { … … 64 98 65 99 if($this->jabber->Subscribe($jid)) 100 { 101 $this->disconnect(); 66 102 return true; 103 } 67 104 } 68 105 else 69 106 { 107 $this->disconnect(); 70 108 return false; 71 109 } 72 110 73 $this->disconnect();111 74 112 } 75 113 -
trunk/jabberit_messenger/inc/jabberit_sessions.inc.php
r519 r526 16 16 $_SESSION['phpgw_info']['jabberit_messenger']['passwd'] = $GLOBALS['phpgw_info']['user']['passwd']; 17 17 $_SESSION['phpgw_info']['jabberit_messenger']['mail'] = $GLOBALS['phpgw_info']['user']['email']; 18 19 //Organization Ldap 20 $_SESSION['phpgw_info']['jabberit_messenger']['account_dn'] = $GLOBALS['phpgw_info']['user']['account_dn']; 21 18 22 19 23 //Ldap -
trunk/jabberit_messenger/inc/login.php
r512 r526 21 21 $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user']; 22 22 23 if(isset($_SESSION['phpgw_info']['jabberit_messenger']['use_attribute_jabberit'])) 23 $organization = explode(",", $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit']); 24 25 $organization_user = $_SESSION['phpgw_info']['jabberit_messenger']['account_dn']; 26 $organization_user = substr($organization_user, strpos($organization_user,"ou=") + 3 , strlen($organization_user)); 27 $organization_user = substr($organization_user, 0, strpos($organization_user, ",")); 28 29 if(is_array($organization)) 24 30 { 25 $attribute = $_SESSION['phpgw_info']['jabberit_messenger']['use_attribute_jabberit']; 26 27 if( trim($attribute) == 'mail') 31 foreach($organization as $attr) 28 32 { 29 $uid = $_SESSION['phpgw_info']['jabberit_messenger']['mail']; 30 $uid = substr($uid,0,strpos($uid,"@")); 33 $tmp = explode(";",$attr); 34 if( strtolower(trim($tmp[0])) == strtolower(trim($organization_user))) 35 { 36 switch(strtolower(trim($tmp[1]))) 37 { 38 case "mail" : 39 $uid = $_SESSION['phpgw_info']['jabberit_messenger']['mail']; 40 $uid = substr($uid,0,strpos($uid,"@")); 41 break; 42 43 case "description" : 44 // SERPRO 45 // parte antes do arroba; 46 // Informe aqui a parte da sessão correspondente; 47 $uid = "description"; 48 break; 49 } 50 } 31 51 } 32 else33 {34 $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user'];35 }36 52 } 37 53 38 54 $template = new Template('templates/default'); 39 55 $template->set_var("path", $path);
Note: See TracChangeset
for help on using the changeset viewer.
