Show
Ignore:
Timestamp:
03/13/09 20:15:37 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7411,7413,7415-7416,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7411 | mickecarlsson | 2009-01-07 11:07:27 -0800 (Wed, 07 Jan 2009) | 1 line


Closes #3439 fixes calltrace function for ringgroup with firstnotonphone or firstavailable modes. Thank you naftali5

........

r7442 | mickecarlsson | 2009-02-03 10:33:30 -0800 (Tue, 03 Feb 2009) | 1 line


Closes #3510 add missing echo in code. Thank you jsarrel

........

r7462 | p_lindheimer | 2009-02-17 13:07:28 -0800 (Tue, 17 Feb 2009) | 1 line


add webserver as acceptable AUTHTYPE so admin module does not complain

........

r7464 | mickecarlsson | 2009-03-01 11:03:55 -0800 (Sun, 01 Mar 2009) | 1 line


Closes #3557, fixes typo in code. Thank you zultron.

........

r7469 | mbrevda | 2009-03-07 14:15:25 -0800 (Sat, 07 Mar 2009) | 1 line


cosmetic and security settings updated; updated applet to latest version

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5

    • Property svnmerge-integrated changed from /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340 to /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469

  • modules/branches/2.5/blacklist/page.blacklist.php

    r6886 r7524  
    6464 
    6565  <tr> 
    66     <td><b><?php _("Number") ?></b></td> 
     66    <td><b><?php echo _("Number") ?></b></td> 
    6767    <td>&nbsp;</td> 
    6868    <td>&nbsp;</td> 

  • modules/branches/2.5/core/etc/extensions.conf

    r7519 r7524  
    9595; 
    9696exten => s,n+2(a30),Set(HuntMember=HuntMember${HuntLoop}) 
    97 exten => s,n,GotoIf($[$["${CALLTRACE_HUNT}" != "" ] & $["${RingGroupMethod}" = "hunt" ]]?a32:a35) 
     97exten => s,n,GotoIf($[$["${CALLTRACE_HUNT}" != "" ] & $[$["${RingGroupMethod}" = "hunt" ] | $["${RingGroupMethod}" = "firstavailable"] | $["${RingGroupMethod}" = "firstnotonphone"]]]?a32:a35) 
     98 
    9899exten => s,n(a32),Set(CT_EXTEN=${CUT(FILTERED_DIAL,,$[${HuntLoop} + 1])}) 
    99100exten => s,n,Set(DB(CALLTRACE/${CT_EXTEN})=${CALLTRACE_HUNT}) 

  • modules/branches/2.5/core/page.ampusers.php

    r6904 r7524  
    160160        </td> 
    161161      </tr> 
    162 <?php if ($amp_conf["AUTHTYPE"] != "database") { ?>      
     162<?php if (($amp_conf["AUTHTYPE"] != "database") || ($amp_conf["AUTHTYPE"] != "webserver")) { ?>      
    163163      <tr> 
    164164        <td colspan="2"> 

  • modules/branches/2.5/fw_langpacks/install.php

    r6683 r7524  
    8585    out(sprintf(_("Preparing to copy %s to %s"),'recordings',"$htdocs_dest")); 
    8686  } else { 
    87     out(sprintf(_("No destination directory %s to copy %s to"),"$htodcs_dest/recordings","recordings")); 
     87    out(sprintf(_("No destination directory %s to copy %s to"),"$htdocs_dest/recordings","recordings")); 
    8888  } 
    8989 
    …… 
    9797      $htdocs_copy[] = array("source" => "$htdocs_source/admin/modules/$file", "dest" => "$htdocs_dest/admin/modules"); 
    9898    } else if ($file != "." && $file != "..") { 
    99       out(sprintf(_("No destination directory %s to copy %s to"),"$htodcs_dest/modules/$file","$file")); 
     99      out(sprintf(_("No destination directory %s to copy %s to"),"$htdocs_dest/modules/$file","$file")); 
    100100    } 
    101101  } 

  • modules/branches/2.5/javassh/page.javassh.php

    r6743 r7524  
    2626    <PARAM NAME="sepframe" value="true"> 
    2727    <PARAM NAME="debug" value="false"> 
     28    <PARAM NAME="" value=""> 
     29    <PARAM NAME="bg-color" value="black"> 
     30    <PARAM NAME="fg-color" value="white"> 
     31    <PARAM NAME="cursor-color" value="white"> 
     32    <PARAM NAME="menus" value="popN"> 
     33    <PARAM NAME="exit-on-logout" value="true"> 
     34    <PARAM NAME="allow-new-server" value="false"> 
    2835</APPLET> 
    2936