Changeset 12487
- Timestamp:
- 09/07/11 07:36:07 (2 years ago)
- Files:
-
- modules/branches/2.9/phonebook/module.xml (modified) (2 diffs)
- modules/branches/2.9/phonebook/page.phonebook.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.9/phonebook/module.xml
r11922 r12487 3 3 <repo>extended</repo> 4 4 <name>Phonebook</name> 5 <version>2.9.0. 2</version>5 <version>2.9.0.3</version> 6 6 <publisher>FreePBX</publisher> 7 7 <license>GPLv2+</license> … … 15 15 <md5sum>cac34ab94378d9817a1d666a4e8ed964</md5sum> 16 16 <changelog> 17 *2.9.0.3* #5355 17 18 *2.9.0.2* spelling, localizations 18 19 *2.9.0.1* set reposoitory modules/branches/2.9/phonebook/page.phonebook.php
r11788 r12487 54 54 $fields = phonebook_fgetcsvfromline($line, 3); 55 55 $fields = array_map('trim', $fields); 56 if (is_array($fields) && count($fields) == 3 && is_numeric($fields[2]) && ($fields[3] == '' || is_numeric($fields[3]))) { 56 if (is_array($fields) && count($fields) == 3 57 && is_numeric($fields[2]) 58 && ($fields[3] == '' || is_numeric($fields[3])) 59 ) { 57 60 phonebook_del($fields[2], $numbers[$fields[2]]['speeddial']); 58 phonebook_add(htmlentities($fields[2],ENT_QUOTES), addslashes(htmlentities($fields[1],ENT_QUOTES)), htmlentities($fields[3],ENT_QUOTES)); 61 phonebook_add(htmlentities($fields[2],ENT_QUOTES, 'UTF-8'), 62 addslashes(htmlentities($fields[1],ENT_QUOTES, 'UTF-8')), 63 htmlentities($fields[3],ENT_QUOTES, 'UTF-8')); 59 64 $i++; 60 65 } … … 216 221 if (!isInteger(theForm.number.value)) 217 222 return warnInvalid(theForm.number, msgInvalidNumber); 218 if (!isAlphanumeric(theForm.name.value))219 return warnInvalid(theForm.name, msgInvalidName);220 223 221 224 defaultEmptyOK = true;
