Changeset 519 for trunk/jabberit_messenger/inc

Timestamp:

10/09/08 08:58:47 (16 years ago)

Author:

niltonneto

Message:

Alterações do desenvolvedor, referente ao:

• Atributo LDAP que será usado para autenticação.
• Tela para incluir OUs que usam outro tipo de atributo (ex. mail) para autenticação.
• Pacotes JAR assinados novamente.

Location:

trunk/jabberit_messenger/inc

Files:

• class.db_im.inc.php (modified) (9 diffs)
• class.ldap_im.inc.php (modified) (2 diffs)
• class.uiconforganization.inc.php (added)
• controller.xml (modified) (1 diff)
• hook_admin.inc.php (modified) (1 diff)
• jabberit_sessions.inc.php (modified) (1 diff)

trunk/jabberit_messenger/inc/class.db_im.inc.php

@@ -35 +35 @@
                 $this->db_type = $_SESSION['phpgw_info']['jabberit_messenger']['server']['db_type'];
                 $this->user_id = $_SESSION['phpgw_info']['jabberit_messenger']['user_id'];
+                $this->connectDB();
         }
 
@@ -40 +41 @@
         {
                 $this->db = new db();
+                $this->db_name = ( !$this->db_name ) ? $_SESSION['phpgwinfo']['db_name'] : $this->db_name;
+                $this->db_host = ( !$this->db_host ) ? $_SESSION['phpgwinfo']['db_host'] : $this->db_host;
+                $this->db_port = ( !$this->db_port ) ? $_SESSION['phpgwinfo']['db_port'] : $this->db_port;
+                $this->db_user = ( !$this->db_user ) ? $_SESSION['phpgwinfo']['db_user'] : $this->db_user;
+                $this->db_pass = ( !$this->db_pass ) ? $_SESSION['phpgwinfo']['db_pass'] : $this->db_pass;
+                $this->db_type = ( !$this->db_type ) ? $_SESSION['phpgwinfo']['db_type'] : $this->db_type;
+                
                 $this->db->connect($this->db_name,$this->db_host,$this->db_port,$this->db_user,$this->db_pass,$this->db_type);          
         }       
@@ -45 +53 @@
         public final function getApplicationsEnabled()
         {
-                $this->connectDB();
+                
                 $this->db->query("SELECT * FROM phpgw_config WHERE config_app = 'phpgwapi' and config_name ='apps_jabberit'");
                 if($this->db->num_rows())
@@ -61 +69 @@
         public final function getApplicationsList()
         {
-                $this->connectDB();
                 $this->db->query("SELECT * FROM phpgw_applications WHERE app_enabled = '1' order by app_name");
                 if($this->db->num_rows())
@@ -85 +92 @@
         public final function get_accounts_acl()
         {
-                $this->connectDB();                     
-                
                 $query  = "select acl_account from phpgw_acl where acl_location in (select acl_account from phpgw_acl where acl_appname = 'jabberit_messenger') ";
                 $query .= "union select acl_account from phpgw_acl where acl_appname = 'jabberit_messenger'";
@@ -109 +114 @@
         public final function getPreferences()
         {
-                $this->connectDB();
-                
                 $result = array();
                 $query = "select * from phpgw_preferences where preference_owner = '".$this->user_id."' and preference_app = 'jabberit_messenger'";
@@ -128 +131 @@
         public final function setPreferences($pParam)
         {
-                $this->connectDB();
                 $preferences = $pParam['preferences'];
                 $user_id  = $this->user_id;
@@ -151 +153 @@
         public final function setApplications($pApplications)
         {
-                $this->connectDB();
                 $apps = serialize($pApplications);
                 
@@ -175 +176 @@
                 return false;   
         }
+        
+        public final function setAttributesLdap($pAttributes)
+        {
+                $values = $pAttributes['conf'];
+                $attributesOrg = "";            
+
+                if( $this->db )
+                {
+                        $query = "SELECT * from phpgw_config WHERE config_app = 'phpgwapi' and config_name = 'attributes_org_ldap_jabberit'";
+
+                        if ( $this->db->query($query) )
+                        {       
+                                while($this->db->next_record())
+                                        $result[] = $this->db->row();
+                
+                                if(count($result) > 0)
+                                        $attributesOrg = $result[0]['config_value'];
+                        }
+
+                        if( trim($attributesOrg) == "" )
+                        {
+                                $query = "INSERT INTO phpgw_config(config_app,config_name,config_value) VALUES('phpgwapi','attributes_org_ldap_jabberit','".$values."')";
+                                $this->db->query($query);
+                                
+                                $attr = explode(";", $values);
+                                $values = "<return><ou attr='".$attr[1]."'>".$attr[0]."</ou></return>";
+                                return $values;
+                        }
+                        else
+                        {
+                                $org = explode(",", $attributesOrg);
+                                $newValue = explode(";", $values);
+                                
+                                foreach( $org as $tmp )
+                                {
+                                        $attr = explode(";",$tmp);
+                                        if( strtolower(trim($attr[0])) == strtolower(trim($newValue[0])) )
+                                                return false;
+                                }
+
+                                $values = $values . "," . $attributesOrg;
+                                $query = "UPDATE phpgw_config SET config_value = '".$values."' WHERE config_app = 'phpgwapi' AND config_name = 'attributes_org_ldap_jabberit'";
+                                $this->db->query($query);
+
+                                $return = explode(",",$values);
+                                natcasesort($return);
+
+                                $values = "<return>";
+                                
+                                foreach($return as $tmp)
+                                {
+                                        $attr = explode(";", $tmp);
+                                        $values .= "<ou attr='" . $attr[1] . "'>" . $attr[0] . "</ou>";
+                                }
+                                        
+                                $values .= "</return>";
+                                
+                                return $values;                         
+                        }
+                }
+                return false; 
+        }
+        
+        public final function removeAttributesLdap($pOrg)
+        {
+                $organization = $pOrg['org'];
+                
+                if( $this->db )
+                {
+                        $query = "SELECT * from phpgw_config WHERE config_app = 'phpgwapi' and config_name = 'attributes_org_ldap_jabberit'";
+                                
+                        if ( $this->db->query($query) )
+                        {       
+                                while( $this->db->next_record() )
+                                        $result[] = $this->db->row();
+                
+                                if( count($result) > 0 )
+                                        $attributesOrg = $result[0]['config_value'];
+                        }
+
+                        $attributesOrg = explode(",", $attributesOrg);
+                        $newValue = ""; 
+                        foreach($attributesOrg as $tmp)
+                        {
+                                $attr = explode(";",$tmp);
+                                 
+                                if( strtolower(trim($attr[0])) != strtolower(trim($organization)))
+                                {
+                                        $newValue .= $attr[0] . ";" . $attr[1] . ",";
+                                }
+                        }
+                        
+                        $newValue = substr($newValue, 0,(strlen($newValue) -1 ));
+                        
+                        if( trim($newValue) != "")
+                                $query = "UPDATE phpgw_config SET config_value = '".$newValue."' WHERE config_app = 'phpgwapi' AND config_name = 'attributes_org_ldap_jabberit'";
+                        else
+                                $query = "DELETE from phpgw_config where config_name = 'attributes_org_ldap_jabberit'";
+                                
+                        if( $this->db->query($query))
+                                return true;
+                        else
+                                return false;
+                }
+                return false;   
+        }
 }
 ?>

trunk/jabberit_messenger/inc/class.ldap_im.inc.php

@@ -49 +49 @@
                 {
                         $GLOBALS['phpgw_info']['server']['ldap_version3'] = true;
-                        $this->ldap = $this->common->ldapConnect( $this->ldap_host,$this->ldap_dn,$this->ldap_pass );
+                        $this->ldap = $this->common->ldapConnect( $this->ldap_host,$this->ldap_dn,$this->ldap_pass, true );
                 }
         }
@@ -113 +113 @@
         }
         
-        public final function teste()
+        public final function list_organizations_ldap()
         {
-                 return 'dentro da classe do php';
+                $result_org = "<organizations>";
+
+                $this->_connect_ldap();
+        
+                if( $this->ldap )
+                {
+                        $filter="ou=*";         
+                        $justthese = array("ou");
+                        $search = ldap_search($this->ldap,$this->ldap_context,$filter,$justthese);                      
+                        $entry = ldap_get_entries($this->ldap, $search);
+                }
+
+                foreach($entry as $tmp)
+                        if($tmp['ou'][0] != "")
+                                $result_org .= "<ou>" . $tmp['ou'][0] . "</ou>";  
+
+                $result_org .= "</organizations>";
+                
+                return $result_org;
         }
 }

trunk/jabberit_messenger/inc/controller.xml

@@ -32 +32 @@
                         <item ref="contacts_im" alias="list_contacts" class="contacts_im" method="list_contacts" prefix="class." suffix=".inc.php"/>
                         <item ref="db_im" alias="getPreferences" class="db_im" method="getPreferences" prefix="class." suffix=".inc.php"/>
+                        <item ref="db_im" alias="setAttributesLdap" class="db_im" method="setAttributesLdap" prefix="class." suffix=".inc.php"/>
                         <item ref="db_im" alias="setPreferences" class="db_im" method="setPreferences" prefix="class." suffix=".inc.php"/>
+                        <item ref="db_im" alias="removeAttributesLdap" class="db_im" method="removeAttributesLdap" prefix="class." suffix=".inc.php"/>                  
                         <item ref="ldap_im" alias="list_organizations_ldap" class="ldap_im" method="list_organizations_ldap" prefix="class." suffix=".inc.php"/>
                         <item ref="ldap_im" alias="photo_ldap" class="ldap_im" method="photo_ldap" prefix="class." suffix=".inc.php"/>

trunk/jabberit_messenger/inc/hook_admin.inc.php

@@ -15 +15 @@
         $file = array(
                 'Site Configuration'    => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
-                'Enable the Expresso Messenger inside of the modules' => $GLOBALS['phpgw']->link('/index.php','menuaction=jabberit_messenger.uimodule.edit_conf')
+                'Enable the Expresso Messenger inside of the modules' => $GLOBALS['phpgw']->link('/index.php','menuaction=jabberit_messenger.uimodule.edit_conf'),
+                'Configuration of authentication attribute by Organization (OU)' => $GLOBALS['phpgw']->link('/index.php','menuaction=jabberit_messenger.uiconforganization.edit_conf')
         );
         
 //Do not modify below this line
         display_section($appname,$title,$file);
+        
 ?>

trunk/jabberit_messenger/inc/jabberit_sessions.inc.php

@@ -40 +40 @@
                 $_SESSION['phpgw_info']['jabberit_messenger']['name_company']                   = $GLOBALS['phpgw_info']['server']['name_company_applet_jabberit'];
                 $_SESSION['phpgw_info']['jabberit_messenger']['use_attribute_jabberit'] = $GLOBALS['phpgw_info']['server']['use_attribute_jabberit'];
+                $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit'] = $GLOBALS['phpgw_info']['server']['attributes_org_ldap_jabberit'];
 
 ?>