Changeset 13605
- Timestamp:
- 02/27/12 20:42:56 (1 year ago)
- Files:
-
- modules/branches/2.10/core/functions.inc.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.10/core/functions.inc.php
r13601 r13605 219 219 220 220 function generate_loggergeneral_additional($ast_version) { 221 global $amp_conf; 221 222 $output = ''; 222 223 223 if ( isset($this->_loggergeneral) && is_array($this->_loggergeneral)) {224 if (!empty($this->_loggergeneral)) { 224 225 foreach ($this->_loggergeneral as $values) { 225 226 $output .= $values['key']."=".$values['value']."\n"; 226 227 } 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 } 227 234 } 228 235 return $output; … … 234 241 235 242 function generate_loggerlogfiles_additional($ast_version) { 243 global $amp_conf; 236 244 $output = ''; 237 245 238 if ( isset($this->_loggerlogfiles) && is_array($this->_loggerlogfiles)) {246 if (!empty($this->_loggerlogfiles)) { 239 247 foreach ($this->_loggerlogfiles as $values) { 240 248 $output .= $values['key']."=".$values['value']."\n"; 241 249 } 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"; } 242 256 } 243 257 return $output;
