Show
Ignore:
Timestamp:
04/29/09 19:46:45 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7552-7571,7573-7597 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.5

........

r7552 | mickecarlsson | 2009-03-26 23:09:45 -0700 (Thu, 26 Mar 2009) | 1 line


Added GPL license text to various files

........

r7591 | p_lindheimer | 2009-04-27 12:09:11 -0700 (Mon, 27 Apr 2009) | 1 line


fix error message so it is same wether username was correct or not

........

r7592 | p_lindheimer | 2009-04-27 13:34:43 -0700 (Mon, 27 Apr 2009) | 1 line


make sure the requested report display is included in the menu items list, otherwise bogus values can be injected

........

r7593 | p_lindheimer | 2009-04-27 13:54:36 -0700 (Mon, 27 Apr 2009) | 1 line


make sure no bogus characters or scripts are injected in a get with the POST/GET variables that reporting uses

........

r7594 | p_lindheimer | 2009-04-27 15:23:37 -0700 (Mon, 27 Apr 2009) | 1 line


run extdisplay and all the derivatives through htmlspecialchars since many pages echo it in the display, this keeps any bogus characters that could create issues from being injected if a url is manually be typed in

........

r7595 | p_lindheimer | 2009-04-27 15:25:25 -0700 (Mon, 27 Apr 2009) | 1 line


filter the search parameters (and sort) to keep bogus entries from creating problems when redisplayed or links generated

........

r7597 | p_lindheimer | 2009-04-29 16:35:39 -0700 (Wed, 29 Apr 2009) | 1 line


add security check when action verb is set to protect against CSRF attacks, but can be disabled with CHECREFERER=false in amportal.conf

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.5:1-7351,7461-7544 to /freepbx/branches/2.5:1-7351,7461-7544,7552-7571,7573-7597
  • freepbx/trunk/update_l10n.sh

    r2836 r7598  
    11#! /bin/sh 
    2  
     2# This file is part of FreePBX. 
     3
     4#    FreePBX is free software: you can redistribute it and/or modify 
     5#    it under the terms of the GNU General Public License as published by 
     6#    the Free Software Foundation, either version 2 of the License, or 
     7#    (at your option) any later version. 
     8
     9#    FreePBX is distributed in the hope that it will be useful, 
     10#    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     11#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     12#    GNU General Public License for more details. 
     13
     14#    You should have received a copy of the GNU General Public License 
     15#    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>. 
     16
     17#    Copyright 2006, diego_iastrubni 
     18
    319echo "Creating new POT template file" 
    420find amp_conf/htdocs/admin -name '*.php' | xargs xgettext -L PHP -o freepbx.pot --keyword=_ -