- Timestamp:
- 09/12/08 16:53:08 (16 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r414 r422 1137 1137 function get_maillist_info($uidnumber) 1138 1138 { 1139 1140 1139 /* folling referral connection */ 1141 1140 $ldap_conn_following_ref = ldap_connect($_SESSION['phpgw_info']['expresso']['cc_ldap_server']['host']); … … 1170 1169 $result['cn'] = $entry[0]['cn'][0]; 1171 1170 $result['mail'] = $entry[0]['mail'][0]; 1171 $result['description'] = utf8_decode($entry[0]['description'][0]); 1172 1172 $result['accountStatus'] = $entry[0]['accountstatus'][0]; 1173 1173 $result['phpgwAccountVisible'] = $entry[0]['phpgwaccountvisible'][0]; … … 1987 1987 $info['uid'] = $uid; 1988 1988 $info['mail'] = $params['mail']; 1989 $info['description'] = utf8_encode($params['description']); 1989 1990 1990 1991 if ($params['accountStatus'] == 'on') … … 2070 2071 2071 2072 $uid = $params['uid']; 2072 $justthese = array("accountStatus", "phpgwAccountVisible", "cn", "mail", "mailForwardingAddress");2073 2074 $institutional_accounts = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=i)(uid=$uid))") , $justthese);2073 //$justthese = array("accountStatus", "phpgwAccountVisible", "cn", "mail", "mailForwardingAddress", "description"); 2074 2075 $institutional_accounts = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=i)(uid=$uid))")); 2075 2076 $entrie = ldap_get_entries($this->ldap, $institutional_accounts); 2076 2077 … … 2092 2093 $return['cn'] = $entrie[0]['cn'][0]; 2093 2094 $return['mail'] = $entrie[0]['mail'][0]; 2095 $return['description'] = utf8_decode($entrie[0]['description'][0]); 2094 2096 2095 2097 if ($entrie[0]['mailforwardingaddress']['count'] > 0) -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r414 r422 80 80 $maillist_info['loginShell'] = '/bin/false'; 81 81 $maillist_info['mail'] = $params['mail']; 82 $maillist_info['description'] = $params['description']; 82 83 $maillist_info['objectClass'][0] = 'posixAccount'; 83 84 $maillist_info['objectClass'][1] = 'inetOrgPerson'; … … 180 181 } 181 182 183 /* Always replace description */ 184 $ldap_mod_replace['description'] = utf8_encode($new_values['description']); 185 182 186 if (count($ldap_mod_replace)) 183 187 { -
trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php
r414 r422 298 298 'uid' => $maillist_info['uid'], 299 299 'mail' => $maillist_info['mail'], 300 'description' => $maillist_info['description'], 300 301 'cn' => $maillist_info['cn'], 301 302 'user_count' => $user_count, -
trunk/expressoAdmin1_2/js/jscode/groups.js
r414 r422 90 90 alert(data.msg); 91 91 else{ 92 alert(get_lang('Group sucess created') + '.');92 alert(get_lang('Group sucessful created') + '.'); 93 93 location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups"; 94 94 } … … 107 107 alert(data.msg); 108 108 else{ 109 alert(get_lang('Group sucess saved') + '.');109 alert(get_lang('Group sucessful saved') + '.'); 110 110 location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups"; 111 111 } -
trunk/expressoAdmin1_2/js/jscode/institutional_accounts.js
r317 r422 240 240 241 241 Element('cn').value = data.cn; 242 243 242 Element('mail').value = data.mail; 244 243 Element('description').value = data.description; 245 244 Element('ea_select_owners').innerHTML = data.owners; 246 245 -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r414 r422 6 6 7 7 if (document.forms[0].uid.value == ''){ 8 alert(get_lang(' LOGINfield is empty') + '.');8 alert(get_lang('login field is empty') + '.'); 9 9 return; 10 10 } 11 11 12 12 if (document.forms[0].cn.value == ''){ 13 alert(get_lang(' NAMEfield is empty') + '.');13 alert(get_lang('name field is empty') + '.'); 14 14 return; 15 15 } … … 20 20 if ((uid_tmp.length < 3) || (uid_tmp[0] != 'lista')){ 21 21 alert( 22 get_lang(' LOGINfield is incomplete') + '.\n' +22 get_lang('login field is incomplete') + '.\n' + 23 23 get_lang('the login field must be formed like') + ':\n' + 24 24 get_lang('list') + '-' + get_lang('organization') + '-' + get_lang('listname') + '.\n' + … … 95 95 alert(data.msg); 96 96 else{ 97 alert(get_lang('Email list sucess created') + '.');97 alert(get_lang('Email list sucessful created') + '.'); 98 98 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; 99 99 } … … 112 112 alert(data.msg); 113 113 else{ 114 alert(get_lang('Email list sucess saved') + '.');114 alert(get_lang('Email list sucessful saved') + '.'); 115 115 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; 116 116 } … … 137 137 alert(data.msg); 138 138 else 139 alert(get_lang('SCL sucess saved') + '.');139 alert(get_lang('SCL sucessful saved') + '.'); 140 140 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; 141 141 return; -
trunk/expressoAdmin1_2/js/jscode/users.js
r414 r422 204 204 alert(data.msg); 205 205 else 206 alert(get_lang('User sucess created') + '.');206 alert(get_lang('User sucessful created') + '.'); 207 207 208 208 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; … … 223 223 } 224 224 else{ 225 alert(get_lang('User sucess saved') + '.');225 alert(get_lang('User sucessful saved') + '.'); 226 226 } 227 227 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; … … 446 446 alert(data.msg); 447 447 else 448 alert(get_lang('Default password sucess saved') + '.');448 alert(get_lang('Default password sucessful saved') + '.'); 449 449 return; 450 450 } … … 459 459 alert(data.msg); 460 460 else 461 alert(get_lang('Users password sucess returned') + '.');461 alert(get_lang('Users password sucessful returned') + '.'); 462 462 return; 463 463 } … … 474 474 alert(data.msg); 475 475 else 476 alert(get_lang('User sucess deleted') + '.');476 alert(get_lang('User sucessful deleted') + '.'); 477 477 478 478 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; … … 526 526 alert(data.msg); 527 527 else{ 528 alert(get_lang('User login sucess renamed') + "\n" + data.exec_return);528 alert(get_lang('User login sucessful renamed') + "\n" + data.exec_return); 529 529 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; 530 530 } -
trunk/expressoAdmin1_2/templates/default/institutional_accounts_modal.tpl
r317 r422 1 1 <input type="hidden" id="{modal_id}_title" value="{lang_criation_of_institutional_accounts}"> 2 <input type="hidden" id="{modal_id}_height" value=" 483">2 <input type="hidden" id="{modal_id}_height" value="503"> 3 3 <input type="hidden" id="{modal_id}_width" value="930"> 4 4 <input type="hidden" id="{modal_id}_close_action" value="close_lightbox()"> … … 24 24 {lang_mail}: <font color="blue">{lang_eg}: diser@celepar.pr.gov.br</font><br> 25 25 <input id="mail" name="mail" size="35" autocomplete="off"><br> 26 27 {lang_description}:<br> 28 <input id="description" name="description" size="60" autocomplete="off"><br> 26 29 27 30 {lang_is_account_active}: <input type="checkbox" id="accountStatus" name="accountStatus" checked><br> -
trunk/expressoAdmin1_2/templates/default/maillists_form.tpl
r414 r422 39 39 <input name="cn" size="60" value="{cn}" autocomplete="off"><br> 40 40 41 {lang_e-mail_list_is_active}: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br> 41 {lang_description}:<br> 42 <input name="description" size="60" value="{description}" autocomplete="off"><br> 43 44 {lang_email_list_is_active}: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br> 42 45 {lang_do_not_show_this_e-mail_list}??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br> 43 46
Note: See TracChangeset
for help on using the changeset viewer.