Changeset 438 for trunk/expressoAdmin1_2
- Timestamp:
- 09/18/08 15:19:05 (16 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 10 edited
-
inc/class.group.inc.php (modified) (2 diffs)
-
inc/class.imap_functions.inc.php (modified) (3 diffs)
-
inc/class.ldap_functions.inc.php (modified) (1 diff)
-
inc/class.maillist.inc.php (modified) (3 diffs)
-
inc/class.user.inc.php (modified) (5 diffs)
-
js/jscode/maillists.js (modified) (1 diff)
-
js/jscode/users.js (modified) (1 diff)
-
setup/phpgw_pt-br.lang (modified) (previous)
-
templates/default/maillists_form.tpl (modified) (1 diff)
-
templates/default/maillists_scl.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.group.inc.php
r414 r438 23 23 var $current_config; 24 24 25 26 25 function group() 27 26 { … … 362 361 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 363 362 $array_memberUids_add[] = $user; 364 $this->db_functions->write_log("included user to group"," $dn:$user");363 $this->db_functions->write_log("included user to group","dn:$dn -> uid:$user"); 365 364 } 366 365 } -
trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php
r414 r438 18 18 19 19 function imap_functions(){ 20 $this->functions = new functions; 20 21 $this->imap_admin = $_SESSION['phpgw_info']['expresso']['email_server']['imapAdminUsername']; 21 22 $this->imap_passwd = $_SESSION['phpgw_info']['expresso']['email_server']['imapAdminPW']; 22 23 $this->imap_server = $_SESSION['phpgw_info']['expresso']['email_server']['imapServer']; 23 24 $this->imap_port = $_SESSION['phpgw_info']['expresso']['email_server']['imapPort']; 24 $this->imap_trashfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'];25 $this->imap_sentfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'];26 $this->imap_draftsfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultDraftsFolder'];27 $this->imap_spamfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSpamFolder'];25 $this->imap_trashfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'] : str_replace("*","", $this->functions->lang("trash")); 26 $this->imap_sentfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'] : str_replace("*","", $this->functions->lang("sent")); 27 $this->imap_draftsfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultDraftsFolder'] : str_replace("*","", $this->functions->lang("drafts")); 28 $this->imap_spamfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSpamFolder'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSpamFolder'] : str_replace("*","", $this->functions->lang("spam")); 28 29 $this->imapDelimiter= $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter']; 29 30 $this->imap = imap_open('{'.$this->imap_server.':'.$this->imap_port.'/novalidate-cert}', $this->imap_admin, $this->imap_passwd, OP_HALFOPEN); 30 $this->functions = new functions;31 31 } 32 32 … … 68 68 return $result; 69 69 } 70 /* Esperando correção do william (prognus) sobre a utilização do DSPAM 70 71 if (!empty($this->imap_sentfolder)) 71 72 { … … 78 79 } 79 80 } 81 */ 80 82 81 83 if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($mailquota*1024))) -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r430 r438 197 197 198 198 $result['status'] = false; 199 $ this->functions->lang('This LOGINis already used by') . ":\n" . $users;199 $result['msg'] = $this->functions->lang('this login is already used by') . ":\n" . $users; 200 200 return $result; 201 201 } -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r422 r438 80 80 $maillist_info['loginShell'] = '/bin/false'; 81 81 $maillist_info['mail'] = $params['mail']; 82 $maillist_info['description'] = $params['description'];83 82 $maillist_info['objectClass'][0] = 'posixAccount'; 84 83 $maillist_info['objectClass'][1] = 'inetOrgPerson'; … … 104 103 $maillist_info['mailForwardingAddress'] = $params['mailForwardingAddress']; 105 104 105 if (!empty($params['description'])) 106 $maillist_info['description'] = utf8_encode($params['description']); 107 106 108 $result = $this->ldap_functions->ldap_add_entry($dn, $maillist_info); 107 109 if (!$result['status']) … … 182 184 183 185 /* Always replace description */ 184 $ldap_mod_replace['description'] = utf8_encode($new_values['description']); 185 186 if (empty($new_values['description'])) 187 $ldap_mod_replace['description'] = array(); 188 else 189 $ldap_mod_replace['description'] = utf8_encode($new_values['description']); 190 186 191 if (count($ldap_mod_replace)) 187 192 { -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r414 r438 172 172 //retira caracteres que não são números. 173 173 $params['corporative_information_cpf'] = ereg_replace("[^0-9]", "", $params['corporative_information_cpf']); 174 174 //description 175 175 foreach ($params as $atribute=>$value) 176 176 { … … 295 295 print_r($new_values); 296 296 echo '<br>'; 297 exit; */298 297 exit; 298 */ 299 299 300 300 $manager_account_lid = $_SESSION['phpgw_session']['session_lid']; … … 311 311 } 312 312 313 // Verifica o acesso do gerente313 // Check manager access 314 314 if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users')) 315 315 { … … 757 757 $this->db_functions->add_user2group($gidnumber, $new_values['uidnumber']); 758 758 $this->ldap_functions->add_user2group($gidnumber, $user_uid); 759 $this->db_functions->write_log("in serted user to group", "$dn:$gidnumber");759 $this->db_functions->write_log("included user to group", "uid:$user_uid -> gid:$gidnumber"); 760 760 } 761 761 } … … 832 832 { 833 833 $this->ldap_functions->add_user2maillist($uid, $new_values['mail']); 834 $this->db_functions->write_log("in serted user to maillist","$dn: $uid");834 $this->db_functions->write_log("included user to maillist","$uid: $dn"); 835 835 } 836 836 } -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r422 r438 366 366 alert(data.msg); 367 367 else 368 alert(get_lang('Email list success deleted') + '.');368 alert(get_lang('Email list successful deleted') + '.'); 369 369 370 370 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; -
trunk/expressoAdmin1_2/js/jscode/users.js
r422 r438 144 144 { 145 145 if (!data.status) 146 { 146 147 alert(data.msg); 148 } 147 149 else 148 150 { -
trunk/expressoAdmin1_2/templates/default/maillists_form.tpl
r422 r438 43 43 44 44 {lang_email_list_is_active}: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br> 45 {lang_do_not_show_this_e -mail_list}??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br>45 {lang_do_not_show_this_email_list}??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br> 46 46 47 47 <b>{lang_maillist_users} (<font color=red>{user_count}</font>):</b><br> -
trunk/expressoAdmin1_2/templates/default/maillists_scl.tpl
r414 r438 22 22 <tr> 23 23 <td width="25%" valign="bottom" bgcolor="#DDDDDD"> 24 {lang_e -mail_list}:<br><b><span style="color:red;">{mail}<span></b><br><br>24 {lang_email_list}:<br><b><span style="color:red;">{mail}<span></b><br><br> 25 25 {lang_apply_send_control_list_to_this_list}?<input type="checkbox" {accountRestrictive_checked} name="accountRestrictive"><br> 26 {lang_participants_from_the_list_can_send_e -mail_to_this_list}? <input type="checkbox" {participantCanSendMail_checked} name="participantCanSendMail"><br>26 {lang_participants_from_the_list_can_send_email_to_this_list}? <input type="checkbox" {participantCanSendMail_checked} name="participantCanSendMail"><br> 27 27 <br> 28 <b>{lang_users_who_can_send_e -mail_to_this_list}:</b><br>28 <b>{lang_users_who_can_send_email_to_this_list}:</b><br> 29 29 <select id="ea_select_users_SCL_Maillist" name="members[]" style="width:400px; height:200px" multiple size="13">{ea_select_users_SCL_Maillist}</select> 30 30 </td>
Note: See TracChangeset
for help on using the changeset viewer.
