Changeset 10460 for modules/branches/2.6/phonebook

Timestamp:

11/01/10 16:02:25 (3 years ago)

Author:

p_lindheimer

Message:

Merged revisions 10399-10418,10420-10422,10424-10426,10428-10429,10432,10436-10458 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.7

................

r10399 | GameGamer?43 | 2010-10-14 10:05:48 -0700 (Thu, 14 Oct 2010) | 1 line

closes #4590 - fixes issues with phonebook import

................

r10457 | p_lindheimer | 2010-11-01 12:46:35 -0700 (Mon, 01 Nov 2010) | 24 lines

Merged revisions 10456 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8

................

r10456 | p_lindheimer | 2010-11-01 12:39:25 -0700 (Mon, 01 Nov 2010) | 17 lines

Merged revisions 10444,10447,10449-10451,10453-10455 via svnmerge from
http://svn.freepbx.org/modules/branches/2.9

........

r10444 | mbrevda | 2010-10-25 05:43:18 -0700 (Mon, 25 Oct 2010) | 1 line

re #4604 - potential injection when uploading files. Can be closed by when published/backported

........

r10454 | p_lindheimer | 2010-11-01 10:51:02 -0700 (Mon, 01 Nov 2010) | 1 line

block xss re #4615

........

r10455 | p_lindheimer | 2010-11-01 12:12:39 -0700 (Mon, 01 Nov 2010) | 1 line

changes to some of the fixes re #4604

........

................

................

r10458 | p_lindheimer | 2010-11-01 12:49:10 -0700 (Mon, 01 Nov 2010) | 1 line

update xml re #4590

................

Files:

• modules/branches/2.6 (modified) (1 prop)
• modules/branches/2.6/phonebook/module.xml (modified) (2 diffs)
• modules/branches/2.6/phonebook/page.phonebook.php (modified) (1 diff)

modules/branches/2.6/phonebook/module.xml

@@ -2 +2 @@
-  <rawname>phonebook</rawname>
-  <name>Phonebook</name>
-0
+1
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -14 +14 @@
-  <md5sum>2515bdf0aebeec2ff87b813c2c17881a</md5sum>
-  <changelog>
+    *2.6.0.1* #4590
-    *2.6.0.0* localizations, misc
-    *2.5.0.2* localization changes, Swedish

modules/branches/2.6/phonebook/page.phonebook.php

@@ -56 +56 @@
-            if (is_array($fields) && count($fields) == 3 && is_numeric($fields[2]) &&  ($fields[3] == '' || is_numeric($fields[3]))) {
-              phonebook_del($fields[2], $numbers[$fields[2]]['speeddial']);
-$fields[2], addslashes($fields[1]), $fields[3]
+htmlentities($fields[2],ENT_QUOTES), addslashes(htmlentities($fields[1],ENT_QUOTES)), htmlentities($fields[3],ENT_QUOTES)
-              $i++;
-            }