Changeset 13605

Show
Ignore:
Timestamp:
02/27/12 20:42:56 (1 year ago)
Author:
p_lindheimer
Message:

fixes #5633 and also re #5622 have FreePBX generate some logfile configuration if nothng else has been configured

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.10/core/functions.inc.php

    r13601 r13605  
    219219 
    220220  function generate_loggergeneral_additional($ast_version) { 
     221    global $amp_conf; 
    221222    $output = ''; 
    222223 
    223     if (isset($this->_loggergeneral) && is_array($this->_loggergeneral)) { 
     224    if (!empty($this->_loggergeneral)) { 
    224225      foreach ($this->_loggergeneral as $values) { 
    225226        $output .= $values['key']."=".$values['value']."\n"; 
    226227      } 
     228    } else { 
     229      // If they don't have anythng in custom then put in a default format 
     230      $general = parse_ini_file($amp_conf['ASTETCDIR'] . '/logger_general_custom.conf'); 
     231      if (empty($general)) { 
     232        $output = "dateformat=%F %T" . "\n"; 
     233      } 
    227234    } 
    228235    return $output; 
     
    234241 
    235242  function generate_loggerlogfiles_additional($ast_version) { 
     243    global $amp_conf; 
    236244    $output = ''; 
    237245 
    238     if (isset($this->_loggerlogfiles) && is_array($this->_loggerlogfiles)) { 
     246    if (!empty($this->_loggerlogfiles)) { 
    239247      foreach ($this->_loggerlogfiles as $values) { 
    240248        $output .= $values['key']."=".$values['value']."\n"; 
    241249      } 
     250    } else { 
     251      // If they don't have anythng in custom then put in a default settng 
     252      $logfiles = parse_ini_file($amp_conf['ASTETCDIR'] . '/logger_logfiles_custom.conf'); 
     253      if (empty($logfiles)) { 
     254        $output = "console => notice,warning,error" . "\n"; 
     255        $output .= "full => notice,warning,error,debug,verbose" . "\n"; } 
    242256    } 
    243257    return $output;