Changeset 10285 for freepbx/trunk

Show
Ignore:
Timestamp:
09/15/10 20:13:59 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10163-10171,10173-10284 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.8

........

r10169 | p_lindheimer | 2010-07-21 11:52:03 -0700 (Wed, 21 Jul 2010) | 1 line


fixes #4461 adapt to 1.4+ asterisk syntax. This change will break 1.2 systems

........

r10226 | p_lindheimer | 2010-08-24 16:08:16 -0700 (Tue, 24 Aug 2010) | 1 line


fixes #4509 and re #4134 use proper path for call monitor

........

r10246 | mickecarlsson | 2010-09-06 22:25:50 -0700 (Mon, 06 Sep 2010) | 1 line


Re #3503 Add Chinese language as selection in FreePBX, it was removed in r7337 and I forgot to add it back when proper language files was submitted. This change should be merged to all supported version

........

r10268 | p_lindheimer | 2010-09-14 15:56:42 -0700 (Tue, 14 Sep 2010) | 1 line


fixes #4501 change to 1.4+ syntax (this breaks 1.2 I believe - WARNING)

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.8:1-10162 to /freepbx/branches/2.8:1-10284

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

    r10212 r10285  
    188188    <option value="en_US" <?php echo ($_COOKIE['lang']=="en_US" ? "selected" : "") ?> >English</option> 
    189189    <option value="bg_BG" <?php echo ($_COOKIE['lang']=="bg_BG" ? "selected" : "") ?> >Bulgarian</option> 
     190    <option value="zh_CN" <?php echo ($_COOKIE['lang']=="zh_CN" ? "selected" : "") ?> >Chinese</option> 
    190191    <option value="de_DE" <?php echo ($_COOKIE['lang']=="de_DE" ? "selected" : "") ?> >Deutsch</option> 
    191192    <option value="es_ES" <?php echo ($_COOKIE['lang']=="es_ES" ? "selected" : "") ?> >Espa&ntilde;ol</option> 

  • freepbx/trunk/amp_conf/htdocs/recordings/includes/callme.php

    r9663 r10285  
    9494  $priority = "1"; 
    9595  $callerid = "VMAIL/$from"; 
    96   $variable = "MSG=$new_path|MBOX=$from"; 
     96  $variable = "MSG=$new_path,MBOX=$from"; 
    9797  /* Arguments to Originate: channel, extension, context, priority, timeout, callerid, variable, account, application, data */ 
    9898  $status = $astman->Originate($channel, $extension, $context, $priority, NULL, $callerid, $variable, NULL, NULL, NULL); 

  • freepbx/trunk/amp_conf/htdocs/recordings/includes/common.php

    r9663 r10285  
    110110  global $ASTERISKCDR_DBNAME; 
    111111 
    112   global $ASTERISK_CALLMONITOR_PATH; 
    113   global $ast_spool_dir; 
    114  
    115112  global $ARI_DISABLED_MODULES; 
    116113   
    …… 
    168165      $amp_dbhost = isset($amp_conf["AMPDBHOST"]) ? $amp_conf["AMPDBHOST"] : $LEGACY_AMP_DBHOST; 
    169166      $amp_dbname = isset($amp_conf["AMPDBNAME"]) ? $amp_conf["AMPDBNAME"] : $LEGACY_AMP_DBNAME; 
    170  
    171       $ast_spool_dir = isset($amp_conf["ASTSPOOLDIR"]) ? $amp_conf["ASTSPOOLDIR"] : $ASTERISK_CALLMONITOR_PATH; 
    172167 
    173168      $asteriskcdr_dbengine = $ASTERISKCDR_DBENGINE; 

  • freepbx/trunk/amp_conf/htdocs/recordings/modules/callmonitor.module

    r10122 r10285  
    103103  function display($args) { 
    104104 
    105     global $ast_spool_dir; 
     105    global $ASTERISK_CALLMONITOR_PATH; 
    106106    global $CALLMONITOR_ALLOW_DELETE; 
    107107    global $AJAX_PAGE_REFRESH_ENABLE; 
    108108 
    109109    $display = new DisplaySearch(); 
     110 
    110111    // get the search string 
    111112    $m = getArgument($args,'m'); 
    …… 
    131132 
    132133    // get the call monitor recording files 
    133     $paths = explode(';',$ast_spool_dir); 
     134    $paths = split(';',$ASTERISK_CALLMONITOR_PATH); 
    134135    foreach($paths as $key => $path) { 
    135136      if (!is_dir($path)) { 
    …… 
    137138      } 
    138139    } 
    139     $recordings = $this->getRecordings($ast_spool_dir,$data); 
     140    $recordings = $this->getRecordings($ASTERISK_CALLMONITOR_PATH,$data); 
    140141 
    141142    // build controls 

  • freepbx/trunk/amp_conf/htdocs/recordings/modules/settings.module

    r10122 r10285  
    13501350    global $asterisk_manager_interface; 
    13511351 
    1352     $response = $asterisk_manager_interface->Command("Action: Command\r\nCommand: Reload app_voicemail.so\r\n\r\n"); 
     1352    $response = $asterisk_manager_interface->Command("Action: Command\r\nCommand: module reload app_voicemail.so\r\n\r\n"); 
    13531353  } 
    13541354