Changeset 5821
- Timestamp:
- 03/26/12 16:24:32 (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.db_functions.inc.php
r5819 r5821 682 682 } 683 683 684 function write_log($action, $about) 685 { 686 $sql = "INSERT INTO phpgw_expressoadmin_log (date, manager, action, userinfo) " 687 . "VALUES('now','" . $_SESSION['phpgw_info']['expressomail']['user']['account_lid'] . "','" . strtolower($action) . "','" . strtolower($about) . "')"; 688 if (!$this->db->query($sql)) { 689 return false; 690 } 691 return true; 692 } 684 693 } 685 694 ?> -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5513 r5821 87 87 $this->ldap_host = $_SESSION['phpgw_info']['expressomail']['server']['ldap_host']; 88 88 $this->ldap_context = $_SESSION['phpgw_info']['expressomail']['server']['ldap_context']; 89 $this->ds = ldap_connect($this->ldap_host); 90 ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3); 91 ldap_set_option($this->ds, LDAP_OPT_REFERRALS, $refer); 92 ldap_bind($this->ds, $_SESSION['phpgw_info']['expressomail']['server']['ldap_root_dn'],$_SESSION['phpgw_info']['expressomail']['server']['ldap_root_pw']); 93 89 90 if($_SESSION['phpgw_info']['expressomail']['server']['ldap_master_host'] && 91 $_SESSION['phpgw_info']['expressomail']['server']['ldap_master_root_dn'] && 92 $_SESSION['phpgw_info']['expressomail']['server']['ldap_master_root_pw']) { 93 $this->ds = ldap_connect($_SESSION['phpgw_info']['expressomail']['server']['ldap_master_host']); 94 ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3); 95 ldap_set_option($this->ds, LDAP_OPT_REFERRALS,0); 96 ldap_bind($this->ds, $_SESSION['phpgw_info']['expressomail']['server']['ldap_master_root_dn'], $_SESSION['phpgw_info']['expressomail']['server']['ldap_master_root_pw']); 97 }else{ 98 $this->ds = ldap_connect($this->ldap_host); 99 ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3); 100 ldap_set_option($this->ds, LDAP_OPT_REFERRALS, $refer); 101 ldap_bind($this->ds, $_SESSION['phpgw_info']['expressomail']['server']['ldap_root_dn'],$_SESSION['phpgw_info']['expressomail']['server']['ldap_root_pw']); 102 } 94 103 } 95 104 … … 1156 1165 return $return; 1157 1166 } 1167 1168 function save_telephoneNumber($params){ 1169 $return = array(); 1170 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['blockpersonaldata']){ 1171 $return['error'] = $this->functions->getLang("You can't modify your Commercial Telephone."); 1172 return $return; 1173 } 1174 $old_telephone = 0; 1175 $pattern = '/\([0-9]{2,3}\)[0-9]{4}-[0-9]{4}$/'; 1176 if ((strlen($params['number']) != 0) && (!preg_match($pattern, $params['number']))) 1177 { 1178 $return['error'] = $this->functions->getLang('The format of telephone number is invalid'); 1179 return $return; 1180 } 1181 if($params['number'] != $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number']) { 1182 $old_telephone = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number']; 1183 $this->ldapRootConnect(false); 1184 if(strlen($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number']) == 0) { 1185 $info['telephonenumber'] = $params['number']; 1186 $result = @ldap_mod_add($this->ds, $_SESSION['phpgw_info']['expressomail']['user']['account_dn'], $info); 1187 } 1188 else { 1189 $info['telephonenumber'] = $params['number']; 1190 $result = @ldap_mod_replace($this->ds, $_SESSION['phpgw_info']['expressomail']['user']['account_dn'], $info); 1191 } 1192 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number'] = $info['telephonenumber']; 1193 // Log updated telephone number by user action 1194 include_once('class.db_functions.inc.php'); 1195 $db_functions = new db_functions(); 1196 $db_functions->write_log('modified user telephone',"User changed its own telephone number in preferences $old_telephone => ".$info['telephonenumber']); 1197 unset($info['telephonenumber']); 1198 } 1199 return $return['ok'] = true; 1200 } 1158 1201 } 1159 1202 ?> -
trunk/expressoMail1_2/index.php
r5804 r5821 217 217 218 218 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] : 1; 219 // ACL for block edit Personal Data. 220 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['enable_quickadd_telephonenumber'] = $current_config['expressoMail_enable_quickadd_telephonenumber'] == 'true' ? $current_config['expressoMail_enable_quickadd_telephonenumber'] : ""; 221 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['enable_quickadd_telephonenumber']){ 222 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['blockpersonaldata'] = $GLOBALS['phpgw']->acl->check('blockpersonaldata',1,'preferences'); 223 } 224 219 225 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['auto_close_first_tab'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_close_first_tab'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_close_first_tab'] : "0"; 220 226 -
trunk/expressoMail1_2/js/draw_api.js
r5814 r5821 493 493 if(Element("table_quota")) 494 494 connector.loadScript("InfoQuota"); 495 496 if(preferences.enable_quickadd_telephonenumber) 497 connector.loadScript("QuickAddTelephone"); 495 498 } 496 499 -
trunk/expressoMail1_2/setup/phpgw_pt-br.lang
r5809 r5821 683 683 Send this mail as text plain expressoMail1_2 pt-br Enviar este e-mail como texto simples 684 684 The text format will be lost expressoMail1_2 pt-br A formatação do texto será perdida 685 The format of telephone number is invalid expressoMail1_2 pt-br O formato do número de telefone é inválido 686 Telephone number updated with success. expressoMail1_2 pt-br Telefone atualizado com sucesso. 687 Click here to update your telephone expressoMail1_2 pt-br Clique aqui para atualizar seu telefone 688 Update my telephone expressoMail1_2 pt-br Atualizar meu telefone 689 You can't modify your Commercial Telephone. expressoMail1_2 pt-br Você não tem permissão para modificar seu Telefone Comercial. 690 Warning for users expressoMail1_2 pt-br Aviso importante aos usuários 691 text_Warning expressoMail1_2 pt-br Caro usuário, <br>Mantenha seu Telefone Comercial sempre atualizado no Expresso. Muitas pessoas consultam o Catálogo do Expresso como se fosse uma lista telefônica. 692 Close this warning expressoMail1_2 pt-br Fechar este aviso 685 693 Warning expressoMail1_2 pt-br Atenção 686 694 Discard expressoMail1_2 pt-br Descartar -
trunk/expressoMail1_2/templates/default/config.tpl
r5804 r5821 212 212 </tr> 213 213 214 <tr bgcolor="{th_bg}"> 215 <td colspan="2"> 216 217 </td> 218 </tr> 219 220 <tr bgcolor="{row_on}"> 221 <td colspan="2"> 222 <label style="font-weight:bold;">{lang_Quick_add_widget_for_telephone_number}</label> 223 </td> 224 </tr> 225 226 <tr bgcolor="{row_off}"> 227 <td>{lang_Enable_quick_add_for_user}</td> 228 <td> 229 <select id="use_quickadd" name="newsettings[expressoMail_enable_quickadd_telephonenumber]"> 230 <option value="false" {selected_expressoMail_enable_quickadd_telephonenumber_false}>{lang_No}</option> 231 <option value="true" {selected_expressoMail_enable_quickadd_telephonenumber_true}>{lang_Yes}</option> 232 </select> 233 </td> 234 </tr> 235 <tr bgcolor="{row_on}"> 236 <td>{lang_Days_interval_to_show_balloon_for_user}</td> 237 <td> 238 <input size="5" name="newsettings[expressoMail_quickadd_days_expire_balloon]" value="{value_expressoMail_quickadd_days_expire_balloon}"> 239 <span>{lang_day(s)}</span> 240 <input type="hidden" name="valida_alert_days_expire_balloon" value="{lang_The field should only contain numbers}" /> 241 </td> 242 </tr> 243 214 244 <!-- END body --> 215 245 <!-- BEGIN footer -->
Note: See TracChangeset
for help on using the changeset viewer.