Changeset 9069

Show
Ignore:
Timestamp:
03/02/10 00:58:20 (2 years ago)
Author:
p_lindheimer
Message:

closes #2181 RELOADCONFIRM (def true) set amp_conf variable false if you do not want to click to confirm on reload

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

    r9043 r9069  
    752752  'USEQUEUESTATE'   => array('bool' , false), 
    753753  'CHECKREFERER'    => array('bool' , true), 
    754   'USEDIALONE'    => array('bool' , false), 
     754  'USEDIALONE'      => array('bool' , false), 
     755  'RELOADCONFIRM'   => array('bool' , true), 
    755756); 
    756757 

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_reload.php

    r9040 r9069  
    11<script type="text/javascript"> 
    2   function freepbx_show_reload() { 
     2  function freepbx_show_reload(confirm) { 
    33    /* 
    44    $.blockUI($('#reloadBox')[0], { width: '400px' }); 
    …… 
    66    */ 
    77     
    8     $("#reload_confirm").show(); 
     8    if (confirm == 1) { 
     9      $("#reload_confirm").show(); 
     10    } 
    911    $("#reload_reloading").hide(); 
    1012    $("#reload_response").hide(); 
    …… 
    1517    }); 
    1618     
     19    if (confirm == 0) { 
     20      $("#reload_confirm").hide(); 
     21      run_reload(); 
     22    } 
     23 
    1724    // add keyboard handler 
    1825    $('#reloadBox').keydown( function(e) { 

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_reloadbar.php

    r6976 r9069  
    11<?php 
    2 echo "\n\t\t<div class=\"attention\" id=\"need_reload_block\"><a href=\"#\" onclick=\"freepbx_show_reload();\" class=\"info\">"; 
     2global $amp_conf; 
     3$reload_confirm = $amp_conf['RELOADCONFIRM'] ? 1 : 0; 
     4echo "\n\t\t<div class=\"attention\" id=\"need_reload_block\"><a href=\"#\" onclick=\"freepbx_show_reload($reload_confirm);\" class=\"info\">"; 
    35echo '<img src="images/database_gear.png" height="16" width="16" border="0" alt="'._('Reload Required').'" title="'._('Reload Required').'" />&nbsp;'; 
    46echo _("Apply Configuration Changes"); 

  • freepbx/trunk/amportal.conf

    r9043 r9069  
    274274# if not specified it will default to mohmp3 for backward compatibility. 
    275275MOHDIR=moh 
     276 
     277# RELOADCONFIRM=true|false 
     278# DEFAULT VALUE: true 
     279# When set to false, will by-pass the confirm on Relaod Box