Changeset 32

Timestamp:

06/08/07 15:18:19 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• admin/setup/phpgw_pt-br.lang (modified) (previous)
• admin/templates/default/config.tpl (modified) (1 diff)
• expressoAdmin1_2/docs/change_log.txt (modified) (1 diff)
• expressoAdmin1_2/inc/class.bomanagers.inc.php (modified) (6 diffs)
• expressoAdmin1_2/inc/class.bosectors.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/class.db_functions.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/class.functions.inc.php (modified) (7 diffs)
• expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (1 diff)
• expressoAdmin1_2/inc/class.sosectors.inc.php (modified) (1 diff)
• expressoAdmin1_2/inc/class.uiaccounts.inc.php (modified) (6 diffs)
• expressoAdmin1_2/inc/class.uimanagers.inc.php (modified) (7 diffs)
• expressoAdmin1_2/inc/class.uisectors.inc.php (modified) (5 diffs)
• expressoAdmin1_2/inc/class.user.inc.php (modified) (1 diff)
• expressoAdmin1_2/js/jscode/users.js (modified) (2 diffs)
• expressoAdmin1_2/setup/phpgw_pt-br.lang (modified) (previous)
• expressoAdmin1_2/templates/default/accounts_form.tpl (modified) (3 diffs)
• expressoAdmin1_2/templates/default/images/samba.png (added)
• expressoAdmin1_2/templates/default/index.tpl (modified) (1 diff)
• expressoAdmin1_2/templates/default/managers_form.tpl (modified) (1 diff)
• expressoAdmin1_2/templates/default/sectors.tpl (modified) (2 diffs)
• expressoAdmin1_2/templates/default/sectors_form.tpl (modified) (1 diff)
• help/content.html (added)
• help/css (added)
• help/css/index.css (added)
• help/images (deleted)
• help/index.html (modified) (1 diff)
• help/templates/celepar/images/001_logoinicial.jpg (added)
• help/templates/celepar/images/002_logoexpmail.jpg (added)
• help/templates/celepar/images/003_logoagenda.jpg (added)
• help/templates/celepar/images/004_logocatalogo.jpg (added)
• help/templates/celepar/images/005_logoboletins.jpg (added)
• help/templates/celepar/images/006_logologout.jpg (added)
• help/templates/celepar/images/007_acoesmensagem.jpg (added)
• help/templates/celepar/images/008_opcoesmensagem.jpg (added)
• help/templates/celepar/images/008_opcoesmensagem_tmb.jpg (added)
• help/templates/celepar/images/008_opcoesmensagem_tmb2.jpg (added)
• help/templates/celepar/images/009_botaodireito.jpg (added)
• help/templates/celepar/images/010_contatos.jpg (added)
• help/templates/celepar/images/010_contatos_tmb.jpg (added)
• help/templates/celepar/images/011_pesquisar.jpg (added)
• help/templates/celepar/images/011_pesquisar_tmb.jpg (added)
• help/templates/celepar/images/012_menuprincipal.jpg (added)
• help/templates/celepar/images/013_arvorecatalogo.jpg (added)
• help/templates/celepar/images/014_opcoescatalogo.jpg (added)
• help/templates/celepar/images/fundo_topo.jpg (added)
• help/templates/celepar/images/topo.jpg (added)
• instant_messenger/docs/change_log.txt (modified) (1 diff)
• instant_messenger/inc/class.Socket.inc.php (modified) (3 diffs)
• instant_messenger/inc/class.Ujabber.inc.php (modified) (11 diffs)
• instant_messenger/inc/class.contacts_im.inc.php (modified) (1 diff)
• instant_messenger/inc/class.ldap_im.inc.php (modified) (5 diffs)
• instant_messenger/index.php (modified) (1 diff)
• instant_messenger/index2.php (modified) (1 diff)
• instant_messenger/js/im_functions.js (modified) (4 diffs)
• instant_messenger/js/im_preferences.js (modified) (3 diffs)
• instant_messenger/js/im_templates.js (modified) (1 diff)
• instant_messenger/js/im_win.js (modified) (2 diffs)
• instant_messenger/setup/phpgw_pt-br.lang (modified) (previous)
• phpgwapi/inc/class.auth_ldap.inc.php (modified) (1 diff)
• preferences/changepassword.php (modified) (4 diffs)
• preferences/setup/phpgw_pt-br.lang (modified) (previous)
• preferences/templates/default/changepassword.tpl (modified) (1 diff)

trunk/admin/templates/default/config.tpl

@@ -195 +195 @@
    
    <tr class="row_off">
+    <td>{lang_How_many_letters_the_user_password_must_contain_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_letters_userpass]" value="{value_num_letters_userpass}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_special_letters_the_user_password_must_contain_(default_0)_?}:</td>
+    <td>
+     <input name="newsettings[num_special_letters_userpass]" value="{value_num_special_letters_userpass}" size="5">
+    </td>
+   </tr>
+      
+   <tr class="row_off">
     <td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
     <td>

trunk/expressoAdmin1_2/docs/change_log.txt

@@ -62 +62 @@
 29/05/2007
 - Ao renomear um usuário, seu sieve script também é renomeado.
+
+01/06/2007
+- Corrigido bug ao editar usuários sem nenhum grupo.
+- Retirado códigos de chamada a funão get_sectors (depreciada).
+- Criado acl view_user (pode apenas ver informações, sem editar).
+- Retirado códigos de chamada ao manage_wf_sectors (depreciado).
+
+04/06/2007
+- Permitido ocultar setores.

trunk/expressoAdmin1_2/inc/class.bomanagers.inc.php

@@ -34 +34 @@
                         'delete_users'                          => $_POST['delete_users'],
                         'rename_users'                          => $_POST['rename_users'],
+                        'view_users'                            => $_POST['view_users'],
                         'add_groups'                            => $_POST['add_groups'],
                         'edit_groups'                           => $_POST['edit_groups'],
@@ -50 +51 @@
                         'view_global_sessions'          => $_POST['view_global_sessions'],
                         'view_logs'                                     => $_POST['view_logs'],
-                        'manage_wf_sectors'             => $_POST['manage_wf_sectors'],
                         'create_computers'                      => $_POST['create_computers'],
                         'edit_computers'                        => $_POST['edit_computers'],
@@ -59 +59 @@
                         // Soma os niveis de acesso criando uma ACL
                         $acl = 0;
-                        $acl = $acl + $manager['add_users'] + $manager['edit_users'] + $manager['delete_users'] + $manager['rename_users'];
+                        $acl = $acl + $manager['add_users'] + $manager['edit_users'] + $manager['delete_users'] + $manager['rename_users'] + $manager['view_users'];
                         $acl = $acl + $manager['add_groups'] + $manager['edit_groups'] + $manager['delete_groups'];
                         $acl = $acl + $manager['change_users_password'] + $manager['change_users_quote'] + $manager['set_user_default_password'];
                         $acl = $acl + $manager['edit_sambausers_attributes'] + $manager['edit_sambadomains'];
                         $acl = $acl + $manager['add_email_lists'] + $manager['edit_email_lists'] + $manager['delete_email_lists'];
-                        $acl = $acl + $manager['create_sectors'] + $manager['edit_sectors'] + $manager['delete_sectors'] + $manager['manage_wf_sectors'] + $manager['view_global_sessions'];
+                        $acl = $acl + $manager['create_sectors'] + $manager['edit_sectors'] + $manager['delete_sectors'] + $manager['view_global_sessions'];
                         $acl = $acl + $manager['create_computers'] + $manager['edit_computers'] + $manager['delete_computers'];
                         $acl = $acl + $manager['view_logs'];
@@ -105 +105 @@
                         'delete_users'                          => $_POST['delete_users'],
                         'rename_users'                          => $_POST['rename_users'],
+                        'view_users'                            => $_POST['view_users'],
                         'add_groups'                            => $_POST['add_groups'],
                         'edit_groups'                           => $_POST['edit_groups'],
@@ -121 +122 @@
                         'view_global_sessions'          => $_POST['view_global_sessions'],
                         'view_logs'                                     => $_POST['view_logs'],
-                        'manage_wf_sectors'                     => $_POST['manage_wf_sectors'],
                         'create_computers'                      => $_POST['create_computers'],
                         'edit_computers'                        => $_POST['edit_computers'],
@@ -130 +130 @@
                         // Soma os niveis de acesso criando uma ACL
                         $acl = 0;
-                        $acl = $acl + $manager['add_users'] + $manager['edit_users'] + $manager['delete_users'] + $manager['rename_users'];
+                        $acl = $acl + $manager['add_users'] + $manager['edit_users'] + $manager['delete_users'] + $manager['rename_users'] + $manager['view_users'];
                         $acl = $acl + $manager['add_groups'] + $manager['edit_groups'] + $manager['delete_groups'];
                         $acl = $acl + $manager['change_users_password'] + $manager['change_users_quote'] + $manager['set_user_default_password'];
                         $acl = $acl + $manager['edit_sambausers_attributes'] + $manager['edit_sambadomains'];
                         $acl = $acl + $manager['add_email_lists'] + $manager['edit_email_lists'] + $manager['delete_email_lists'];
-                        $acl = $acl + $manager['create_sectors'] + $manager['edit_sectors'] + $manager['delete_sectors'] + $manager['manage_wf_sectors'] + $manager['view_global_sessions'];
+                        $acl = $acl + $manager['create_sectors'] + $manager['edit_sectors'] + $manager['delete_sectors'] + $manager['view_global_sessions'];
                         $acl = $acl + $manager['create_computers'] + $manager['edit_computers'] + $manager['delete_computers'];
                         $acl = $acl + $manager['view_logs'];

trunk/expressoAdmin1_2/inc/class.bosectors.inc.php

@@ -45 +45 @@
                         $sector_info['objectClass'][0]  = 'top';
                         $sector_info['objectClass'][1]  = 'organizationalUnit';
+                        $sector_info['objectClass'][2]  = 'phpgwAccount';
+                        
+                        if ($_POST['sector_visible'])
+                                $sector_info['phpgwaccountvisible'] = '-1';
                         
                         // Chama funcao para escrever no OpenLDAP, case de erro, volta com msg de erro.
@@ -61 +65 @@
                         $GLOBALS['phpgw']->redirect($url);
                 }
-                
+
                 function save_sector()
                 {
+                        $sector_info = $this->so->get_info($_POST['context']);
+                        
+                        if (($_POST['sector_visible'] == 'on') && ($sector_info['phpgwaccountvisible'] != '-1'))
+                        {
+                                foreach ($sector_info[0]['objectclass'] as $objectClass)
+                                {
+                                        if ($objectClass == 'phpgwAccount')
+                                                $phpgwAccount = true;
+                                        else
+                                                $phpgwAccount = false;
+                                }
+                                
+                                if (!$phpgwAccount)
+                                {
+                                        $ldap_mod_add['objectClass'][] = 'phpgwAccount';
+                                }
+                                
+                                $ldap_mod_add['phpgwaccountvisible'] = '-1';
+                                $this->so->add_attribute($sector_info[0]['dn'], $ldap_mod_add);
+                        }
+                        else
+                        {
+                                $ldap_mod_del['phpgwaccountvisible'] = array();
+                                $this->so->remove_attribute($sector_info[0]['dn'], $ldap_mod_del);
+                        }
+                                
                         // Volta para o ListSectors
-                        $url = ($GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uisectors.list_sectors'));
-                        $GLOBALS['phpgw']->redirect($url);
+                        ExecMethod('expressoAdmin1_2.uisectors.list_sectors');
                 }
-                
+
                 function delete_sector()
                 {

trunk/expressoAdmin1_2/inc/class.db_functions.inc.php

@@ -39 +39 @@
         }
         
+        /*
         function get_sectors($params)
         {
@@ -55 +56 @@
                 return $result;
         }
-
+        */
+        
         function get_next_id()
         {

trunk/expressoAdmin1_2/inc/class.functions.inc.php

@@ -43 +43 @@
                         {
                                 case list_users:
-                                        if ($array_acl[add_users] || $array_acl[edit_users] || $array_acl[delete_users] || $array_acl[change_users_password] || $array_acl[change_users_quote] || $array_acl[edit_sambausers_attributes])
+                                        if ($array_acl[add_users] || $array_acl[edit_users] || $array_acl[delete_users] || $array_acl[change_users_password] || $array_acl[change_users_quote] || $array_acl[edit_sambausers_attributes] || $array_acl[view_users])
                                                 return true;
                                         break;
@@ -62 +62 @@
                                                 return true;
                                         break;
+                                case view_users:
+                                        if ($array_acl[view_users])
+                                                return true;
+                                        break;
                                 case change_users_password:
                                         if ($array_acl[change_users_password])
@@ -134 +138 @@
                                         break;
 
-                                case manage_wf_sectors:
-                                        if ($array_acl[manage_wf_sectors])
-                                                return true;
-                                        break;
-                                
                                 case view_global_sessions:
                                         if ($array_acl[view_global_sessions])
@@ -192 +191 @@
                 
                 // Make a array read humam
+                // Last acl:    33.554.432
                 function make_array_acl($acl)
                 {
@@ -198 +198 @@
                         $array_acl['delete_users'] = $acl & 4;
                         $array_acl['rename_users'] = $acl & 8388608;
+                        $array_acl['view_users'] = $acl & 33554432;
                         $array_acl['add_groups'] = $acl & 16;
                         $array_acl['edit_groups'] = $acl & 32;
@@ -430 +431 @@
                 {
                         $s = CreateObject('phpgwapi.sector_search_ldap');
-                        $sectors_info = $s->get_organizations($context, $selected, false, false);
+                        $sectors_info = $s->get_organizations($context, $selected, false, true);
                         return $sectors_info;
                 }               
                 
+                /*
                 function get_sectors($context, $selected='')
                 {
@@ -458 +460 @@
                                 return false;
                 }
+                */
                 
                 // Get list of all levels, this function is used for sectors module.

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -881 +881 @@
         function gidnumbers2cn($gidnumbers, $context)
         {
+                $result = array();
                 if (count($gidnumbers))
                 {

trunk/expressoAdmin1_2/inc/class.sosectors.inc.php

@@ -98 +98 @@
                         return(ldap_delete($connection,$dn));
                 }
+                
+                function get_info($context)
+                {
+                        $connection = $GLOBALS['phpgw']->common->ldapConnect();
+                        $filter="(objectClass=organizationalUnit)";
+                        $search=ldap_search($connection, $context, $filter);
+                        $result = ldap_get_entries($connection, $search);
+                        return $result;
+                }
+                
+                function add_attribute($dn, $info)
+                {
+                        $connection = $GLOBALS['phpgw']->common->ldapConnect();
+                        
+                        if (ldap_mod_add($connection, $dn, $info))
+                        {
+                                ldap_close($connection);
+                                return true;
+                        }
+                        else
+                        {
+                                echo 'Erro na escrita no LDAP, funcao add_attribute: ' . ldap_error($connection);
+                                ldap_close($connection);
+                                return false;
+                        }
+                }
+                
+                function remove_attribute($dn, $info)
+                {
+                        $connection = $GLOBALS['phpgw']->common->ldapConnect();
+                        
+                        if (ldap_mod_del($connection, $dn, $info))
+                        {
+                                ldap_close($connection);
+                                return true;
+                        }
+                        else
+                        {
+                                echo 'Erro na escrita no LDAP, funcao remove_attribute: ' . ldap_error($connection);
+                                ldap_close($connection);
+                                return false;
+                        }
+                }
+
         }
 ?>

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -17 +17 @@
                         'add_users'                                     => True,
                         'edit_user'                                     => True,
+                        'view_user'                                     => True,
                         'show_photo'                            => True,
                         'show_access_log'                       => True,
@@ -132 +133 @@
                                         ($this->functions->check_acl($account_lid,'change_users_quote'))) 
                                         $can_edit = True;
+                                elseif ($this->functions->check_acl($account_lid,'view_users'))
+                                        $can_view = True;
                                 if ($this->functions->check_acl($account_lid,'delete_users'))
                                         $can_delete = True;
@@ -150 +153 @@
                                         if ($can_edit)
                                                 $p->set_var('row_edit',$this->row_action('edit','user',$account['account_id']));
+                                        elseif ($can_view)
+                                                $p->set_var('row_edit',$this->row_action('view','user',$account['account_id']));
                                         else
                                                 $p->set_var('row_edit',' ');
@@ -174 +179 @@
                 {
                         $GLOBALS['phpgw']->js->validate_file('jscode','users','expressoAdmin1_2');                      
-                        $GLOBALS['phpgw']->js->set_onload('get_sectors(document.forms[0].context.value);');
+                        //$GLOBALS['phpgw']->js->set_onload('get_sectors(document.forms[0].context.value);');
                         $GLOBALS['phpgw']->js->set_onload('get_available_groups(document.forms[0].context.value);');
                         $GLOBALS['phpgw']->js->set_onload('get_available_maillists(document.forms[0].context.value);');
@@ -313 +318 @@
                 }
                 
+                function view_user()
+                {
+                        ExecMethod('expressoAdmin1_2.uiaccounts.edit_user');
+                        return;
+                }
+                
                 function edit_user()
                 {
@@ -326 +337 @@
                         if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) &&
                                 (!$this->functions->check_acl($manager_account_lid,'change_users_password')) &&
-                                (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes')))
+                                (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes')) &&
+                                (!$this->functions->check_acl($manager_account_lid,'view_users'))
+                                )
                         {
                                 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/expressoAdmin1_2/inc/access_denied.php'));

trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php

@@ -206 +206 @@
                                 'lang_view_users'                               => lang('View user'),
                                 'lang_rename_user'                              => lang('Rename users'),
+                                'lang_view_user'                                => lang('View users'),
                                 'lang_add_groups'                               => lang('Add groups'),
                                 'lang_edit_groups'                              => lang('Edit groups'),
@@ -246 +247 @@
                                 'edit_sectors'                                  => $_POST['edit_sectors'] != '' ? 'checked' : '',
                                 'delete_sectors'                                => $_POST['delete_sectors'] != '' ? 'checked' : '',
-                                'manage_wf_sectors'                             => $_POST['manage_wf_sectors'] != '' ? 'checked' : '',
                                 'view_global_sessions'                  => $_POST['view_global_sessions'] != '' ? 'checked' : '',
                                 'view_logs'                                             => $_POST['view_logs'] != '' ? 'checked' : '',
@@ -333 +333 @@
                                 $_POST['delete_users']                  = $acl['delete_users'];
                                 $_POST['rename_users']                  = $acl['rename_users'];
+                                $_POST['view_users']                    = $acl['view_users'];
                                 $_POST['add_groups']                    = $acl['add_groups'];
                                 $_POST['edit_groups']                   = $acl['edit_groups'];
@@ -352 +353 @@
                                 $_POST['view_global_sessions']  = $acl['view_global_sessions'];
                                 $_POST['view_logs']                             = $acl['view_logs'];
-                                $_POST['manage_wf_sectors']             = $acl['manage_wf_sectors'];
                         }
                         
@@ -450 +450 @@
                                 'lang_view_users'                               => lang('View users'),
                                 'lang_rename_user'                              => lang('Rename users'),
+                                'lang_view_user'                                => lang('View users'),
                                 'lang_add_groups'                               => lang('Add groups'),
                                 'lang_edit_groups'                              => lang('Edit groups'),
@@ -478 +479 @@
                                 'delete_users'                                  => $_POST['delete_users'] != '' ? 'checked' : '',
                                 'rename_users'                                  => $_POST['rename_users'] != '' ? 'checked' : '',
+                                'view_users'                                    => $_POST['view_users'] != '' ? 'checked' : '',
                                 'add_groups'                                    => $_POST['add_groups'] != '' ? 'checked' : '',
                                 'edit_groups'                                   => $_POST['edit_groups'] != '' ? 'checked' : '',
@@ -498 +500 @@
                                 'view_global_sessions'                  => $_POST['view_global_sessions'] != '' ? 'checked' : '',
                                 'view_logs'                                             => $_POST['view_logs'] != '' ? 'checked' : '',
-                                'manage_wf_sectors'                             => $_POST['manage_wf_sectors'] != '' ? 'checked' : '',
                                 
                                 // Para o update no banco, preciso saber oq foi alterado e para que.

trunk/expressoAdmin1_2/inc/class.uisectors.inc.php

@@ -17 +17 @@
                         'add_sector'                                    => True,
                         'validate_data_sectors_add'             => True,
+                        'edit_sector'                                   => True,
+                        'validate_data_sectors_edit'    => True,
                         'delete_sector'                                 => True,
                         'css'                                                   => True
@@ -113 +115 @@
                                         $p->set_var($var);
 
+                                        if ($can_edit)
+                                        {
+                                                $p->set_var('edit_link',$this->row_action('edit','sector',$sector->sector_context));
+                                        }
+                                        else
+                                        {
+                                                $p->set_var('edit_link',' ');
+                                        }
+
                                         if ($can_delete)
                                         {
@@ -168 +179 @@
                         // Seta variaveis utilizadas pelo tpl.
                         $var = Array(
-                                'action'                                                => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uisectors.validate_data_sectors_add'),
-                                'back_url'                                      => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uisectors.list_sectors'),
-                                'th_bg'                                         => $GLOBALS['phpgw_info']['theme']['th_bg'],
-                                'context'                                       => $context == '' ? $manager_context : $context,
-                                'sector'                                        => $_POST['sector'],
+                                'action'                        => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uisectors.validate_data_sectors_add'),
+                                'back_url'                      => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uisectors.list_sectors'),
+                                'th_bg'                         => $GLOBALS['phpgw_info']['theme']['th_bg'],
+                                'context'                       => $context == '' ? $manager_context : $context,
+                                'sector'                        => $_POST['sector'],
+                                'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
                                 
-                                'lang_add'                                      => lang('Add'),
-                                'lang_save'                             => lang('Save'),
-                                'lang_back'                             => lang('Back'),
-                                'lang_context'                  => lang('Context'),
+                                'lang_add'                      => lang('Add'),
+                                'lang_save'                     => lang('Save'),
+                                'lang_back'                     => lang('Back'),
+                                'lang_context'          => lang('Context'),
                                 'lang_sector_name'      => lang('Sector name'),
-                                'error_messages'                => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>",
+                                'lang_visible'          => lang('Visible'),
+                                'error_messages'        => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>",
                         );
                         $p->set_var($var);
 
                         $p->pfp('out','create_sector');
+                }
+                
+                function edit_sector()
+                {
+                        //_debug_array($_POST);
+                        
+                        $account_lid = $GLOBALS['phpgw']->accounts->data['account_lid'];
+                        $acl = $this->functions->read_acl($account_lid);
+                        $manager_context = $acl[0]['context'];
+                        
+                        $context = $_GET['context'];
+                        $a_tmp = explode(",", ldap_dn2ufn($context));
+                        $sector_name = $a_tmp[0];
+                        
+                        // Verifica se tem acesso a este modulo
+                        if (!$this->functions->check_acl($account_lid,'edit_sectors'))
+                        {
+                                $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/expressoAdmin1_2/inc/access_denied.php'));
+                        }
+
+                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
+                        unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Sector');
+                        $GLOBALS['phpgw']->common->phpgw_header();
+                        
+                        // Set o template
+                        $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+                        $p->set_file(Array('edit_sector' => 'sectors_form.tpl'));
+                        
+                        if (!$_POST)
+                        {
+                                $sector_info = $this->so->get_info($context);
+                                $_POST['sector_visible'] = $sector_info[0]['phpgwaccountvisible'][0];
+                        } 
+                        
+                        // Seta variaveis utilizadas pelo tpl.
+                        $var = Array(
+                                'action'                        => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.bosectors.save_sector'),
+                                'back_url'                      => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uisectors.list_sectors'),
+                                'th_bg'                         => $GLOBALS['phpgw_info']['theme']['th_bg'],
+                                'context'                       => $context == '' ? $manager_context : $context,
+                                'sector'                                => $_POST['sector'] == '' ? $sector_name : $_POST['sector'],
+                                'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
+                                
+                                'lang_add'                      => lang('Add'),
+                                'disable'                       => 'disabled',
+                                'lang_save'                     => lang('Save'),
+                                'lang_back'                     => lang('Back'),
+                                'lang_context'          => lang('Context'),
+                                'lang_sector_name'      => lang('Sector name'),
+                                'lang_occult_ou'        => lang('Occult Sector'),
+                                'error_messages'        => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>",
+                        );
+                        $p->set_var($var);
+
+                        $p->pfp('out','edit_sector');
                 }
                 
@@ -211 +280 @@
                         ExecMethod('expressoAdmin1_2.bosectors.create_sector');
                 }
-                
+
                 function delete_sector()
                 {
@@ -242 +311 @@
                         
                         // Get users of sector
-                        $sector_users                   = $this->so->get_sector_users($_GET['context']);
+                        $sector_users           = $this->so->get_sector_users($_GET['context']);
                         $sector_groups          = $this->so->get_sector_groups($_GET['context']);
                         $sector_subsectors      = $this->so->get_sector_subsectors($_GET['context']);

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -235 +235 @@
                         $diff = array_diff($new_values, $old_values);
                         
+                        $manager_account_lid = $_SESSION['phpgw_session']['session_lid'];
+                        if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) &&
+                                (!$this->functions->check_acl($manager_account_lid,'change_users_password')) &&
+                                (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes'))
+                                )
+                        {
+                                $return['status'] = false;
+                                $return['msg'] = 'Você não tem direito de editar informações de usuários.';
+                                return $return;
+                        }
+
+                        // Verifica o acesso do gerente
+                        if (!$this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users'))
+                        {
+                                
+                        }
+                        
                         // Verifica o acesso do gerente
                         if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users'))

trunk/expressoAdmin1_2/js/jscode/users.js

@@ -199 +199 @@
 }
 
-
+/*
 function get_sectors(organization, user_context, user_sector)
 {
@@ -246 +246 @@
         cExecute ('$this.db_functions.get_sectors&organization='+organization, handler_get_sectors);
 }
-        
+*/
+
 function get_available_groups(context)
 {

trunk/expressoAdmin1_2/templates/default/accounts_form.tpl

@@ -42 +42 @@
                 <tr bgcolor={row_on}>
                         <td>{lang_organizations}:</td>
-                        <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_sectors(this.value, '{user_context}','{departmentnumber}'); get_available_groups(this.value); get_available_maillists(this.value);">{sectors}</select></td>
+                        <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_available_groups(this.value); get_available_maillists(this.value);">{sectors}</select></td>
                 </tr>
                                                         
@@ -85 +85 @@
                         <td rowspan="4" width="35%">
                                 <img align="center" src="{photo_bin}" id="ea_img_photo" border="0">
-                                <input type="file" id="ea_input_photo" name="photo" {disabled} size=20>
+                                <input type="file" id="ea_input_photo" name="photo" {disabled} size=20><br>
                                 <input type="checkbox" {disabled_delete_photo} {disabled} name="delete_photo" value="1">Deletar foto
                         </td>
@@ -316 +316 @@
                 </td>
                 <td width="10%" align="right" class="td_right" bgcolor="{color_bg1}">
-                        <input type="button" value="{lang_save}" onClick="javascript:validate_fields('{type}');">
+                        <input {disabled} type="button" value="{lang_save}" onClick="javascript:validate_fields('{type}');">
                 </td>
         </tr>

trunk/expressoAdmin1_2/templates/default/index.tpl

@@ -35 +35 @@
         <tr style={display_samba_suport}>
                 <td width="1%" align="center">
-                        <img src='./templates/default/images/computer.png'>
+                        <img src='./templates/default/images/samba.png'>
                 </td>
                 <td>

trunk/expressoAdmin1_2/templates/default/managers_form.tpl

@@ -74 +74 @@
                                                 </tr>
                                                 <tr bgcolor="{color_font1}" align='right'>
+                                                        <td>{lang_view_user}:</td>
+                                                        <td><input type="checkbox" name="view_users" value="33554432" {view_users}></td>
+                                                </tr>
+                                                <tr bgcolor="{color_font2}" align='right'>
                                                         <td>{lang_change_user_password}:</td>
                                                         <td><input type="checkbox" name="change_users_password" value="128" {change_users_password}></td>
                                                 </tr>
-                                                <tr bgcolor="{color_font2}" align='right'>
+                                                <tr bgcolor="{color_font1}" align='right'>
                                                         <td>{lang_change_users_quote}:</td>
                                                         <td><input type="checkbox" name="change_users_quote" value="262144" {change_users_quote}></td>
                                                 </tr>
-                                                <tr bgcolor="{color_font1}" align='right'>
+                                                <tr bgcolor="{color_font2}" align='right'>
                                                         <td>{lang_set_user_default_password}:</td>
                                                         <td><input type="checkbox" name="set_user_default_password" value="524288" {set_user_default_password}></td>

trunk/expressoAdmin1_2/templates/default/sectors.tpl

@@ -21 +21 @@
    <td>{header_name}</td>
    <td>{lang_add_sub_sectors}</td>
+   <td>{header_edit}</td>
    <td>{header_delete}</td>
   </tr>
@@ -31 +32 @@
   <td>{sector_name}</td>
   <td width="25%">{add_link}</td>
+  <td width="5%">{edit_link}</td>
   <td width="5%">{delete_link}</td>
  </tr>

trunk/expressoAdmin1_2/templates/default/sectors_form.tpl

@@ -10 +10 @@
         <form method="POST" action="{action}">
                 <tr>  
-                        <td align="right">
+                        <td>
                                 {lang_sector_name}:
-                        <input type="text" autocomplete="off" name="sector" value={sector}>
                         </td>
-                        <td align="left">
+                        <td>
+                                <input type="text" {disable} autocomplete="off" name="sector" value={sector}>
+                        </td>
+                </tr>
+                <tr>  
+                        <td>
+                                {lang_occult_ou}:
+                        </td>
+                        <td>
+                                <input type="checkbox" name="sector_visible" {sector_visible_checked}>
+                        </td>
+                </tr>
+                <tr>
+                        <td align="left" colspan="2">
                         <input type="submit" name="button_submit" value={lang_save}>
                         <input type="button" value="{lang_back}" onClick="document.location.href='{back_url}'">

trunk/help/index.html

@@ -1 +1 @@
 <html>
-        <head>
-                <title>Expresso Livre</title>
-        </head>
-        <body style="margin:0px;padding:0">
-        <table width="100%"><tr><td align="right" background="images/fundo_topo.jpg"><a name="0"><img src="images/topo.jpg?1"></a></td></tr></table>
-        <div style="margin:10px">
-
-        <font face="Arial" size="2"><center><b><u>Manual do usuário do Expresso</u></b></center></font><br>
-        <p align="center"><font face="Arial" size="2">Clique <b><a href="Manual_Usuario_Expresso.pdf">aqui</a></b>
-                para copiar o manual no formato PDF.</font></p><br>
-        <p><font face="Arial" size="2">No manual do usuário do Expresso você irá encontrar:<br><br><br>
-        <li>Guia de utilização do módulo <b>ExpressoMail 1.2</b>;<br><br>
-        <li>Guia de utilização do módulo <b>Agenda de Eventos</b>;<br><br>
-        <li>Guia de utilização do módulo <b>Catálogo de Endereços</b>;<br><br>
-        </font></p>
-        </div>  
-        <div align="right" style="padding-right:10px"><font face="Arial" size="2">
-        Equipe Expresso
-        <br><a href="http://www.celepar.pr.gov.br" target="_blank">Celepar Informática do Paraná</a></font></div>       
-        </body> 
+<head>
+<title>Ajuda - Expresso Livre</title>
+<link rel='stylesheet' type='text/css' href='css/index.css'/>
+</head>
+<body style="margin:0px;padding:0px;">
+<table width='100%'>
+<tr><td align='right' background="./templates/celepar/images/fundo_topo.jpg">
+<img src="./templates/celepar/images/topo.jpg" style="overflow:hidden;z-index:-1;">
+<p class='titulo' style="font-color:blue;text-align:center;position:absolute;top:20px;left:5px;z-index:0;">Ajuda</p>
+</td></tr></table>
+<iframe frameborder='0' width='100%' height='410px' src="content.html"></iframe>
+</body>
 </html>

trunk/instant_messenger/docs/change_log.txt

@@ -15 +15 @@
 23/05/2007 [0.001]
 - Na tela de autorização do contato, é mostrado o nome, email e a foto do contato que estão no LDAP
+- Correção na Hora que aparece ao lado da mensagem.

trunk/instant_messenger/inc/class.Socket.inc.php

@@ -1 +1 @@
 <?php
         /************************************************************
-         *      Classe Jabber - Expresso                                                                *
+         *      Classe Jabber - Expresso                                                                                *
          *  ------------------------------------------------------- *  
-         *  Com Autenticação no Servidor Jabber com Tls                         *       
-         *  Rodrigo Souza - rodsouza@celepar.pr.gov.br                          *
-         *      Alexandre Correia - alexandrecorreia@celepar.pr.gov.br  *
+         *  Com Autenticação no Servidor Jabber com Tls                                 *       
+         *  Rodrigo Souza - rodsouza@celepar.pr.gov.br                                  *
+         *  Alexandre Correia - alexandrecorreia@celepar.pr.gov.br  *
          ************************************************************/
 
@@ -12 +12 @@
         private $socket;
                 
-        protected final function open($pRemoteSocket, $pTimeOut = 1, $pBlockingMode = 0 )
+        protected final function open($pRemoteSocket, $pTimeOut = 1, $pBlockingMode = 1 )
         {
                 if ( ($this->socket = stream_socket_client($pRemoteSocket, $errno, $errstr)) )
@@ -18 +18 @@
          //$this->socket = stream_socket_client($pRemoteSocket, $errno, $errstr);//, 1, STREAM_CLIENT_CONNECT+STREAM_CLIENT_PERSISTENT);
          //stream_set_write_buffer($this->socket, 0);
-         stream_set_blocking($this->socket, $pBlockingMode);
-         stream_set_timeout($this->socket, 1);//$pTimeOut);
+         stream_set_timeout( $this->socket, 1 );//$pTimeOut);
+         stream_set_blocking( $this->socket, true );
+         
          return true;
       }

trunk/instant_messenger/inc/class.Ujabber.inc.php

@@ -22 +22 @@
         
         private $jid = false;
+        private $email = "";
+        private $contacts = "";
         
         private $log_error_file = 'erro.log';
@@ -36 +38 @@
                 
                 parent :: __construct($this->jid, $this->password, $this->port);
-
+                
         }
         
@@ -59 +61 @@
         
                 // VCARD - PESSOAL
-
                 $VCARD_P = $this->getVcard($this->username."@".$this->server);
                 
-                $group_nusers[0]['VCARD_FN'] = $VCARD_P['FN'];
-                $group_nusers[0]['VCARD_NICKNAME'] = $VCARD_P['NICKNAME']; 
-                $group_nusers[0]['VCARD_ORGNAME'] = $VCARD_P['ORGNAME'];
-                $group_nusers[0]['VCARD_ORGUNIT'] = $VCARD_P['ORGUNIT']; 
-                $group_nusers[0]['VCARD_ROLE'] = $VCARD_P['ROLE']; 
-                $group_nusers[0]['VCARD_BDAY'] = $VCARD_P['BDAY']; 
-                $group_nusers[0]['VCARD_DESC'] = $VCARD_P['DESC'];
-                $group_nusers[0]['VCARD_JID'] = $VCARD_P['JID'];                                
-                
+                $group_nusers[0]['VCARD_FN'] = $VCARD_P[0]['FN'];
+                $group_nusers[0]['VCARD_NICKNAME'] = $VCARD_P[0]['NICKNAME']; 
+                $group_nusers[0]['VCARD_ORGNAME'] = $VCARD_P[0]['ORGNAME'];
+                $group_nusers[0]['VCARD_ORGUNIT'] = $VCARD_P[0]['ORGUNIT']; 
+                $group_nusers[0]['VCARD_ROLE'] = $VCARD_P[0]['ROLE']; 
+                $group_nusers[0]['VCARD_BDAY'] = $VCARD_P[0]['BDAY']; 
+                $group_nusers[0]['VCARD_DESC'] = $VCARD_P[0]['DESC'];
+                $group_nusers[0]['VCARD_JID'] = $VCARD_P[0]['JID'];                             
+        
+                unset($VCARD_P);
                 natcasesort($group_users);              
                 $i=1;
@@ -87 +89 @@
                         $VCARD_U = $this->getVcard($aux_jid[0]."@".$this->server);
                 
-                        $group_nusers[$i]['VCARD_FN'] = $VCARD_U['FN'];
-                        $group_nusers[$i]['VCARD_NICKNAME'] = $VCARD_U['NICKNAME'];
-                        $group_nusers[$i]['VCARD_ORGNAME']  = $VCARD_U['ORGNAME'];
-                        $group_nusers[$i]['VCARD_ORGUNIT']  = $VCARD_U['ORGUNIT'];
-                        $group_nusers[$i]['VCARD_ROLE'] = $VCARD_U['ROLE'];
-                        $group_nusers[$i]['VCARD_BDAY'] = $VCARD_U['BDAY'];
-                        $group_nusers[$i]['VCARD_DESC'] = $VCARD_U['DESC'];
-                        $group_nusers[$i]['VCARD_JID']  = $VCARD_U['JID'];                              
-                
+                        $group_nusers[$i]['VCARD_FN'] = $VCARD_U[0]['FN'];
+                        $group_nusers[$i]['VCARD_NICKNAME'] = $VCARD_U[0]['NICKNAME'];
+                        $group_nusers[$i]['VCARD_ORGNAME']  = $VCARD_U[0]['ORGNAME'];
+                        $group_nusers[$i]['VCARD_ORGUNIT']  = $VCARD_U[0]['ORGUNIT'];
+                        $group_nusers[$i]['VCARD_ROLE'] = $VCARD_U[0]['ROLE'];
+                        $group_nusers[$i]['VCARD_BDAY'] = $VCARD_U[0]['BDAY'];
+                        $group_nusers[$i]['VCARD_DESC'] = $VCARD_U[0]['DESC'];
+                        $group_nusers[$i]['VCARD_JID']  = $VCARD_U[0]['JID'];
+                                
+                        unset($VCARD_U);
                         $i++;                                                                           
                 }
-
+                
                 return $group_nusers;
         }
@@ -113 +116 @@
 
                 $this->sendIq('get', 'update1', NULL, NULL, 'jabber:iq:roster');
-        usleep(50000);
+                usleep(50000);
                 $result = $this->readSocketFromServer();
                 
@@ -240 +243 @@
         
         /*
-         * GetVcard
+         * Vcard
          */
         
@@ -250 +253 @@
 
                 $this->sendIq('get',$id,$pJid,NULL,"vcard-temp","<vCard xmlns='vcard-temp'/>");         
-                usleep(50000);
-                $result = $this->readSocketFromServer();
-                $arr = $result['iq'][0]['#']['vCard'][0]['#'];
-                
-                // vCard
-                $array_vcard['FN'] = trim($arr['FN']['0']['#']) ? urldecode($arr['FN']['0']['#']): $id;
-                $array_vcard['NICKNAME'] = trim($arr['NICKNAME']['0']['#']) ? urldecode($arr['NICKNAME']['0']['#']) : $pJid;
-                $array_vcard['ORGNAME'] = trim($arr['ORG']['0']['#']['ORGNAME']['0']['#']) ? urldecode($arr['ORG']['0']['#']['ORGNAME']['0']['#']) : "";
-                $array_vcard['ORGUNIT'] = trim($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) ? urldecode($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) : "";                
-                $array_vcard['ROLE'] = trim($arr['ROLE']['0']['#']) ? urldecode($arr['ROLE']['0']['#']) : "";                           
-                $array_vcard['BDAY'] = trim($arr['BDAY']['0']['#']) ? urldecode($arr['BDAY']['0']['#']) : "";
-                $array_vcard['DESC'] = trim($arr['DESC']['0']['#']) ? urldecode($arr['DESC']['0']['#']) : "";
-                $array_vcard['JID'] = $pJid;
+                
+                while(($result = $this->readSocketFromServer()) == NULL ){
+                        usleep(40);
+                }
+                
+                if( trim($result['iq'][0]['@']['type']) === trim("result") ){
+
+                                $arr = $result['iq'][0]['#']['vCard'][0]['#'];
+                                        
+                                // vCard
+                                $array_vcard[0]['FN'] = urldecode($arr['FN']['0']['#']);
+                                $array_vcard[0]['NICKNAME'] = urldecode($arr['NICKNAME']['0']['#']);
+                                $array_vcard[0]['ORGNAME'] = urldecode($arr['ORG']['0']['#']['ORGNAME']['0']['#']);
+                                $array_vcard[0]['ORGUNIT'] = urldecode($arr['ORG']['0']['#']['ORGUNIT']['0']['#']);             
+                                $array_vcard[0]['ROLE'] = urldecode($arr['ROLE']['0']['#']);                            
+                                $array_vcard[0]['BDAY'] = urldecode($arr['BDAY']['0']['#']);
+                                $array_vcard[0]['DESC'] = urldecode($arr['DESC']['0']['#']);
+                                $array_vcard[0]['JID'] = $pJid;
+
+                }else{
+                                $array_vcard[0]['FN'] = $pJid;
+                                $array_vcard[0]['NICKNAME'] = $id;
+                                $array_vcard[0]['ORGNAME'] = "";
+                                $array_vcard[0]['ORGUNIT'] = "";                
+                                $array_vcard[0]['ROLE'] = "";                           
+                                $array_vcard[0]['BDAY'] = "";
+                                $array_vcard[0]['DESC'] = "";
+                                $array_vcard[0]['JID'] = $pJid;
+                }
+        
                 return $array_vcard;
         }
@@ -268 +288 @@
         function newVcard($pVcard_User)
         {
-                
                 $pVcard = explode(";",$pVcard_User['vcard']);
                 $nid = explode("@",$this->jid);
                 $id = $nid[0];
                 $xmlVcard = "";
-                
+
                 // Vcard                        
                 $xmlVcard  = "<iq id='$id' type='set'>";
@@ -326 +345 @@
         function SendMessage($pSendMessage)
         {
-                //$this->presence();
                 $to = $pSendMessage['to'];
                 $type = "normal";
@@ -392 +410 @@
         $result = array();
                 $this->sendIq('get',$id,$pJid,NULL,'jabber:iq:last');
-        usleep(50000);
-
+                
+                usleep(50000);
                 $result = $this->readSocketFromServer();
-
+                
                 $time_offline = $result['iq'][0]['#']['query'][0]['@']['seconds'];
                 return $this->time_off_line($time_offline);
@@ -457 +475 @@
                 return ($to) ? $this->presence("unsubscribe", $to) : FALSE;
         }
+
 // TESTE 
 

trunk/instant_messenger/inc/class.contacts_im.inc.php

@@ -14 +14 @@
                 $this->db_user = new db_im();           
         }
+        
+        function set_session_ldap_users()
+        {
+                if(!isset($_SESSION['instant_messenger']['users_ldap']))
+                        $this->users_auth_im();
+                
+        }
+                
+        function users_auth_im()
+        {
+                $db_acls = $this->db_user->get_accounts_acl();
+                
+                // UidNumbers db;
+                foreach($db_acls as $tmp)
+                        $uid_users .= "(uidNumber=".$tmp['acl_account'].")";
+                
+                foreach($db_acls as $tmp)
+                        $uid_groups .= "(gidNumber=".$tmp['acl_account'].")";
+                
+                // usuários;
+                $result_users = $this->ldap_users->list_users_ldap($uid_users);
+                
+                // grupos;
+                $result_groups = $this->ldap_users->list_groups_ldap($uid_groups);
+                
+                foreach($result_groups as $group_tmp){
+                        $tmp = $group_tmp['members'];
+                        foreach($tmp as $value)
+                                $uid_members_group .= "(uid=".$value.")";
+                }
+                
+                $uid_members = $this->ldap_users->list_users_ldap($uid_members_group);
+                $count = count($result_users);
+
+                for($i = 0; $i < count($uid_members); $i++){
+                        $result_users[$count] = $uid_members[$i];
+                        $count++;
+                }
+
+                foreach($result_users as $rs){
+                        $uid[] = $rs['cn'].";".$rs['mail'].";".$rs['ou'];
+                }
+
+                natsort($uid);
+                $uid_un = @array_values(@array_unique($uid));
+                
+                $t = 0;
+                foreach($uid_un as $utmp){
+                        $array = explode(";",$utmp);
+                        $list_ldap[$t]['cn'] = $array[0];
+                        $list_ldap[$t]['mail'] = $array[1];
+                        $list_ldap[$t]['ou'] = $array[2];
+                        $t++;                   
+                }
+
+                $_SESSION['instant_messenger']['users_ldap'] = $list_ldap;
+                
+        }
                 
         function list_contacts($param)
         {
+                $result_users = array();
                 $org_ldap = $param['ou'];
-                $array_db = $this->db_user->get_accounts_acl();
-                $array_groups_ldap = array();
-                $j = 0;
-
-                for($i=0 ; $i < count($array_db); $i++)
-                        $array_1[] = $this->ldap_users->list_users_ldap($org_ldap,"uidNumber", $array_db[$i]['acl_account']);
-        
-                for($i=0; $i < count($array_1); $i++){
-                        if(array_key_exists("count",$array_1[$i])){
-                                $array_groups_ldap[] = $array_1[$i]['uidnumber'];
-                        }               
-                }
+                $i = 0;
+                $this->set_session_ldap_users();
                 
-                for($i=0; $i < count($array_groups_ldap); $i++)
-                        $array_2[]['members'] = $this->ldap_users->list_groups_ldap($org_ldap,$array_groups_ldap[$i]);
-        
-                foreach($array_2 as $tmp){
-                        if($tmp['members'] > 0){
-                                foreach($tmp['members'] as $tmp1)       
-                                        $array_3[] = $tmp1;
-                        }
-                }
-                
-                for($i=0; $i < count($array_1); $i++)
-                        if($array_1[$i]['uid'] != "")
-                                $array_3[] = $array_1[$i]['uid'];
-        
-                @natsort($array_3);
-                
-                $array_4 = @array_values(@array_unique($array_3));
-
-                for($i=0; $i < count($array_4); $i++)
-                        $array_5[] = $this->ldap_users->list_users_ldap($org_ldap,"uid", $array_4[$i]);
-
-                for($i=0 ; $i < count($array_5); $i++){
-                        if($array_5[$i]['phpgwAccountVisible'] != "-1"){
-                                $array_6[] = $array_5[$i]['cn'] . ";" . $array_5[$i]['mail'];
+                foreach($_SESSION['instant_messenger']['users_ldap'] as $users){
+                        if($users['ou'] == ("OU=".$org_ldap)){
+                                $result_users[$i]['cn'] = $users['cn'];
+                                $result_users[$i]['mail'] = $users['mail'];
+                                $i++;
                         }
                 }
 
-                sort($array_6); 
-                
-                for($i=0; $i < count($array_6); $i++){
-                        $aux = explode(";", $array_6[$i]);
-                        $array_7[$j]['cn'] = $aux[0];
-                        $array_7[$j]['mail'] = $aux[1];                 
-                        $j++;
-                }
-                
-                if(count($array_7) > 0)
-                        return $array_7;
+                if(count($result_users) > 0)
+                        return $result_users;
                 else
                         return 0;

trunk/instant_messenger/inc/class.ldap_im.inc.php

@@ -14 +14 @@
                 $this->user             = $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber'];
                 $this->password         = $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'];
-                $this->connect_ldap(false);
+                $this->connect_ldap(true);
         }
         
@@ -28 +28 @@
                 ldap_set_option($this->conn, LDAP_OPT_REFERRALS, $refer);
                 if(trim($this->user) != "")
-                        ldap_bind($this->conn,$this->user,$this->password);
+                        @ldap_bind($this->conn,$this->user,$this->password);
                 else            
-                        ldap_bind($this->conn);
+                        @ldap_bind($this->conn);
         }
         
@@ -72 +72 @@
         }
         
-        function list_users_ldap($orgLdap = false,$type,$uid)
+        function list_users_ldap($filter)
         {
-                $result_users = array();
-                $i = 0;
-                
-                if ($this->conn) {
-                        $filter = $type ."=". $uid;             
-                        $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible");
-                        if($orgLdap)
-                                $search = ldap_search($this->conn,"ou=".$orgLdap.",".$this->ldap_context, $filter, $justthese);
-                        else
-                                $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese);
-                        $entry = ldap_get_entries($this->conn, $search);
+
+                if( $this->conn ){
+                        $filter = "(&(|".$filter.")(phpgwAccountType=u))";
+                        $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn");                   
+                        $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese);
+                        $entry = ldap_get_entries($this->conn,$search);
+                }
+
+                if( $entry['count'] > 0){
+                        $i = 0;
+                        foreach($entry as $tmp)
+                        {
+                                if($tmp['uidnumber'][0] != ""){
+                                        $result_user[$i]['uidnumber'] = $tmp['uidnumber'][0];                   
+                                        $result_user[$i]['mail'] = $tmp['mail'][0];
+                                        $result_user[$i]['uid'] = $tmp['uid'][0];
+                                        $result_user[$i]['cn'] = $tmp['cn'][0];
+                                        $dn = explode(",dc=",$tmp['dn']);
+                                        $ou = explode(",",$dn[0]);
+                                        $result_user[$i]['ou'] = strtoupper(array_pop($ou));
+                                        $i++;
+                                }                               
+                        }
+                        return $result_user;
+                }
+                return 0;
+        }
+        
+        function list_groups_ldap($filter)
+        {
+
+                if( $this->conn ){
+                        $filter = "(&(|".$filter.")(phpgwAccountType=g))";
+                        $justthese = array("gidnumber","cn","memberuid");                       
+                        $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese);
+                        $entry = ldap_get_entries($this->conn,$search);
                 }
                 
-                if($entry['count'] == 0){
-                        $result_users['count'] = 0;
-                        $result_users['uidnumber'] = $uid;
-                        return $result_users;   
+                if( $entry['count'] > 0 ){
+                        $i = 0;
+                        foreach($entry as $tmp)
+                        {
+                                if($tmp['gidnumber'][0] != ""){
+                                        $result_groups[$i]['gidnumber'] = $tmp['gidnumber'][0];
+                                        $org = explode(",",$tmp['dn']);
+                                        $result_groups[$i]['ou'] = strtoupper($org[1]);
+                                        array_shift($tmp['memberuid']);
+                                        foreach($tmp['memberuid'] as $mb)
+                                                $result_groups[$i]['members'][] = $mb;
+                                        $i++;
+                                }
+                        }
+                        return $result_groups;
                 }
-                
-                $result_users['uid'] = $entry[0]['uid'][0];
-                $result_users['uidnumber'] = $entry[0]['uidnumber'][0];
-                $result_users['cn'] = $entry[0]['cn'][0];
-                $result_users['mail'] = $entry[0]['mail'][0];
-                $result_users['phpgwAccountVisible'] = @$entry[0]['phpgwaccountvisible'][0];
+                return 0;
 
-                return $result_users;
-        }
-        
-        function list_groups_ldap($orgLdap, $gid)
-        {
-                $result_groups = "";
-                $i = 0;
-                
-                if ($this->conn) {
-                        $filter="(&(gidNumber=".$gid.")(objectClass=posixGroup))";              
-                        $justthese = array("gidnumber","cn","memberuid");
-                        $search = ldap_search($this->conn,"ou=".$orgLdap.",".$this->ldap_context, $filter, $justthese);
-                        $entry = ldap_get_entries($this->conn, $search);
-                }
-        
-                if($entry['count'] == "1"){
-                        $result_groups = array_shift($entry[0]['memberuid']);
-                        return $entry[0]['memberuid'];
-                }               
-                return false;
         }
         
@@ -134 +145 @@
                 foreach($entry as $tmp){
                         if($tmp['ou'][0] != ""){
-                                $result_org[$i]['ou'] = $tmp['ou'][0];
+                                $result_org[$i] = $tmp['ou'][0];
                                 $i++;
                         }
                 }
+                
+                sort($result_org);
+
                 return $result_org;
         }
@@ -144 +158 @@
         {
                 $uid = $user['uid'];
+                $filter = "(uid=".$uid.")";
                 $i= 0;
                 
-                $entry = $this->list_users_ldap(false,"uid",$uid);
+                $entry = $this->list_users_ldap($filter);
                 
-                $result_users[0]['uid'] = $entry['uid'];
-                $result_users[0]['cn'] = $entry['cn'];
-                $result_users[0]['mail'] = $entry['mail'];
-
-                $_SESSION['debug'] = $result_users;
-                
-                return $result_users;
-                
+                if( count($entry) > 0 ){
+                        return $entry;
+                }else{
+                        return false;   
+                }
         }
 }

trunk/instant_messenger/index.php

@@ -21 +21 @@
         
         // Session
-        $_SESSION['phpgw_info']['instant_messenger']['user']                          = $GLOBALS['phpgw_info']['user']['account_lid'];
+        $_SESSION['phpgw_info']['instant_messenger']['user']                            = $GLOBALS['phpgw_info']['user']['account_lid'];
+        $_SESSION['phpgw_info']['instant_messenger']['user_id']                                 = $GLOBALS['phpgw_info']['user']['account_id'];
         $_SESSION['phpgw_info']['instant_messenger']['passwd']                        = $GLOBALS['phpgw_info']['user']['passwd'];
+        $_SESSION['phpgw_info']['instant_messenger']['email']                         = $GLOBALS['phpgw_info']['user']['email'];
         $_SESSION['phpgw_info']['instant_messenger']['name_jabber']           = $GLOBALS['phpgw_info']['server']['name_jabber'];
         $_SESSION['phpgw_info']['instant_messenger']['port_jabber']           = $GLOBALS['phpgw_info']['server']['port_jabber'];

trunk/instant_messenger/index2.php

@@ -12 +12 @@
 
 $_SESSION['phpgw_info']['instant_messenger']['user']                      = $GLOBALS['phpgw_info']['user']['account_lid'];
+$_SESSION['phpgw_info']['instant_messenger']['user_id']                           = $GLOBALS['phpgw_info']['user']['account_id'];
 $_SESSION['phpgw_info']['instant_messenger']['passwd']                    = $GLOBALS['phpgw_info']['user']['passwd'];
+$_SESSION['phpgw_info']['instant_messenger']['email']                        = $GLOBALS['phpgw_info']['user']['email'];
 $_SESSION['phpgw_info']['instant_messenger']['name_jabber']               = $GLOBALS['phpgw_info']['server']['name_jabber'];
 $_SESSION['phpgw_info']['instant_messenger']['port_jabber']               = $GLOBALS['phpgw_info']['server']['port_jabber'];

trunk/instant_messenger/js/im_functions.js

@@ -306 +306 @@
                                         {
                                                 if( jid == IM.array_users[j].jid ){
-                                                        nickname = IM.array_users[j].VCARD_NICKNAME;
+                                                        nickname = decodeURI(IM.array_users[j].VCARD_NICKNAME);
                                                 }
                                         }
@@ -312 +312 @@
                         if ( window_message )
                         {
-                           window_message.innerHTML += '<strong>' + '['+ TimeStamp +']' + nickname + ' fala:</strong><br/> ' + _this.emotions_icons(body_message) + '<br/><br/>';
+                           window_message.innerHTML += '<strong>' + '['+ TimeStamp +'] ' + nickname + '</strong>&nbsp;' + IM.get_lang('speak') + ':<br/> ' + _this.emotions_icons(body_message) + '<br/><br/>';
                        if ( windowItems[jid].state != WINDOW_STATE_REGULAR && windowItems[jid].state != WINDOW_STATE_MAXIMIZED )
                           im_win.showWindowItem(jid);
@@ -320 +320 @@
                            im_win.open_chat(jid);
                            window_message = document.getElementById(jid + '_chatMessages');
-                           window_message.innerHTML += '<strong>' + '['+ TimeStamp +']' + nickname + ' fala:</strong><br/> ' + _this.emotions_icons(body_message) + '<br/><br/>';
+                           window_message.innerHTML += '<strong>' + '['+ TimeStamp +'] ' + nickname + '</strong>&nbsp;' + IM.get_lang('speak') + ':<br/> ' + _this.emotions_icons(body_message) + '<br/><br/>';
                         }
                                 }
@@ -545 +545 @@
             form_pref += "<dt><a href='javascript:void(0)' onclick='javascript:Preferences.vCardLoad()'>";
             form_pref += "<img src="+img_menu.src+">&nbsp;"+IM.get_lang('Information')+"</a></dt>";
+            form_pref += "<dt><a href='javascript:void(0)' onclick='javascript:Preferences.yourPreferences()'>";
+            form_pref += "<img src="+img_menu.src+">&nbsp;"+IM.get_lang('preferences')+"</a></dt>";
             form_pref += "</dl>";
          im_menu_action.menu(pElement, form_pref);

trunk/instant_messenger/js/im_preferences.js

@@ -29 +29 @@
                         
                         for(var i in data){
-                                var options = new Option(data[i].ou, data[i].ou, false, true);
+                                var options = new Option(data[i], data[i], false, true);
                                 select_org[select_org.length] = options;
                         }
@@ -62 +62 @@
                         if( data.length > 0 ){
                                 for(var i in data){
-                                        var options =  new Option(data[i].cn + " ( "+ data[i].mail + " )", data[i].mail, false, false);
-                                        select_contact[select_contact.length] = options;
+                                        if(data[i].cn != ""){
+                                                var options =  new Option(data[i].cn + " ( "+ data[i].mail + " )", data[i].mail, false, false);
+                                                select_contact[select_contact.length] = options;
+                                        }
                                 }
                         }
@@ -388 +390 @@
         
    /*
+        * Preferências do Usuário
+        */
+
+        Preferences.prototype.yourPreferences = function()
+        {
+
+                //Templates.yourPreferences();
+        
+        }
+        
+   /*
     * Tela de permissão para novos contatos
     */  

trunk/instant_messenger/js/im_templates.js

@@ -365 +365 @@
         }               
         
+        /*
+         * Preferências do usuário
+         */
+        Templates.prototype.yourPreferences = function()
+        {       
+                /*************
+                 Preferências 
+                 Marcação de tempo
+                 Exibir amigos desconectados
+                 Desativar aviso de novos contatos      
+                 Ativar aviso de mensagens recebidas 
+                        - Aviso Normal
+                        - Aviso Médio
+                        - Aviso Chato
+                 Bloquear recebimento de mensagens 
+                 Cadastro de novos grupos;
+                /*************/
+                                                          
+            var form_your_prefe = '<div style="margin-left:10px;margin-top:5px"><dl>' +
+                                                  '<dt><input type="checkbox"> Mostar marcação de tempo </dt> ' +
+                                                  '<dt><input type="checkbox"> Exibir amigos desconectados </dt> ' +                                              
+                                                  '<dt><input type="checkbox"> Desativar aviso de novos contatos </dt> ' +
+                                                  '<dt><input type="checkbox"> Cadastro de novos grupos </dt> ' +                                                                                                                                                         
+                                                  '<dl></div>' +
+                                                  '<div style="margin-top:10px;margin-left:15px"> Ativar aviso de mensagens recebidas </div>' +
+                                                  '<div style="margin-left:20px;margin-top:5px">' +
+                                                                '<input type="radio" id="rd_normal" value="normal"> Modo Normal</br>' +                                                   
+                                                                '<input type="radio" id="rd_medio" value="alerta"> Modo com Alertas</br>' +                                                       
+                                                                '<input type="radio" id="rd_chato" value="chato"> Modo Chato' +
+                                                  '</div>' ;
+                                                                                                        
+                this.conf_form("divYourPrefe",340,200,form_your_prefe,":: " + IM.get_lang('Preferences') + " - Expresso ::");
+        }
+
         //Templates
         var Templates = new Templates();

trunk/instant_messenger/js/im_win.js

@@ -905 +905 @@
          else
             document.title = "......................";
-
+         
+         //this.Mod_Notification();
+                 
          if ( newMessageTimer )
             clearTimeout(newMessageTimer);
@@ -915 +917 @@
       }
       
+   },
+
+   "Mod_Notification" : function()
+   {
+                 /*var mode = "";
+                        
+                 switch(mode){
+                 
+                         case "normal" :
+                                //alert('Modo Normal');
+                         break; 
+                         case "alerta" :
+                                //alert('Modo Alerta');
+                         break;
+                         case "chato" :
+                                 // Treme Tela
+                                 if(self.moveBy)
+                                 {
+                                         for(i=10;i>0;i--)
+                                         {
+                                                 self.moveBy(i,0);
+                                                 self.moveBy(-i,0);
+                                         }
+                                 }
+                         break;
+                         default :
+                 }*/
+
    },
 

trunk/phpgwapi/inc/class.auth_ldap.inc.php

@@ -155 +155 @@
                                 return false;
                         }
-                        $GLOBALS['phpgw']->session->appsession('password','phpgwapi',$new_passwd);
-                        return $entry['userpassword'];
+                        $GLOBALS['phpgw']->session->appsession('password','phpgwapi',base64_encode($new_passwd));
+                        return $new_passwd;
                 }
 

trunk/preferences/changepassword.php

@@ -20 +20 @@
         include('../header.inc.php');
 
+        $a_passwd   = $_POST['a_passwd'];
         $n_passwd   = $_POST['n_passwd'];
         $n_passwd_2 = $_POST['n_passwd_2'];
@@ -32 +33 @@
                 'form' => 'changepassword.tpl'
         ));
+        $GLOBALS['phpgw']->template->set_var('lang_enter_actual_password',lang('Enter your actual password'));
         $GLOBALS['phpgw']->template->set_var('lang_enter_password',lang('Enter your new password'));
         $GLOBALS['phpgw']->template->set_var('lang_reenter_password',lang('Re-enter your password'));
@@ -46 +48 @@
         if ($_POST['change'])
         {
+                if (! $GLOBALS['phpgw']->auth->authenticate($GLOBALS['phpgw_info']['user']['account_lid'], $a_passwd))
+                {
+                        $errors[] = lang('Your actual password is wrong');
+                }
+
                 if ($n_passwd != $n_passwd_2)
                 {
@@ -55 +62 @@
                         $errors[] = lang('You must enter a password');
                 }
+                
+                // Default number of letters = 3
+                if (!$GLOBALS['phpgw_info']['server']['num_letters_userpass'])
+                        $GLOBALS['phpgw_info']['server']['num_letters_userpass'] = 3;
+                // Default number of special letters = 0
+                if (!$GLOBALS['phpgw_info']['server']['num_special_letters_userpass'])
+                        $GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] = 0;
 
+                if ( strlen( $n_passwd ) < $GLOBALS['phpgw_info']['server']['num_letters_userpass'] )
+                {
+                        $errors[] = lang('Your password must contain %1 or more letters', $GLOBALS['phpgw_info']['server']['num_letters_userpass']);
+                }
+                
+                # password that start with a-Z or 0-9 and contain _.-!@#$%&*+=| will be accepted.
+                if (! ereg ("^([-a-zA-Z0-9_.\-!@#$%&*+=|])*$", $n_passwd ) )
+                {
+                        $errors[] = lang('Your password contains characters not allowed');
+                }
+                
+                # password must contain 2 special letters, numbers or special characters
+                if (! ereg ("([0-9_.\-!@#$%&*+=|]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass'].",}", $n_passwd ) )
+                {
+                        $errors[] = lang('Your password must contain at least %1 numbers or characters special', $GLOBALS['phpgw_info']['server']['num_special_letters_userpass']);
+                }
+                
                 if(is_array($errors))
                 {

trunk/preferences/templates/default/changepassword.tpl

@@ -5 +5 @@
    <form method="POST" action="{form_action}">
     <table border="0">
+     <tr>
+       <td>
+        {lang_enter_actual_password}
+       </td>
+       <td>
+        <input type="password" name="a_passwd">
+       </td>
+     </tr>
      <tr>
        <td>