Changeset 9812

Show
Ignore:
Timestamp:
06/02/10 12:22:00 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9634-9729,9733-9795,9798-9811 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.7

........

r9634 | p_lindheimer | 2010-05-14 07:10:47 -0700 (Fri, 14 May 2010) | 1 line


fixes #4269 enclose clid_format in quotes

........

r9811 | p_lindheimer | 2010-06-02 10:09:25 -0700 (Wed, 02 Jun 2010) | 1 line


fixes #4255 enclose the full set of searchstrings in ()

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8

    • Property svnmerge-integrated changed from /freepbx/branches/2.7:1-9372 /freepbx/trunk:1-9714,9744,9768 to /freepbx/branches/2.7:1-9372,9634-9729,9731-9795,9798-9811 /freepbx/trunk:1-9714,9744,9768

  • freepbx/branches/2.8/amp_conf/htdocs/recordings/modules/callmonitor.module

    r9469 r9812  
    632632 
    633633      // allow entries to be viewed with users extension 
     634      $searchText .= "( "; 
    634635      $searchText .= "(src = '" . $_SESSION['ari_user']['extension'] . "' 
    635636                      OR dst = '" . $_SESSION['ari_user']['extension'] . "' 
    …… 
    646647                        OR dst = '" . $_SESSION['ari_user']['outboundCID'] . "')"; 
    647648      } 
     649      $searchText .= ") "; 
    648650    } 
    649651 

  • freepbx/branches/2.8/amp_conf/htdocs_panel/op_server.cfg

    r8095 r9812  
    119119; Formatting of the callerid field 
    120120; where 'x' is a number 
    121 clid_format=(xxx)xxx-xxxx 
     121clid_format="(xxx)xxx-xxxx" 
    122122 
    123123; If you want not to show the callerid on the buttons, set this