Changeset 6506

Show
Ignore:
Timestamp:
08/29/08 18:16:05 (5 years ago)
Author:
p_lindheimer
Message:

return the raw Asterisk version info obtained from checking the version info re #2750 and re #3128

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php

    r6483 r6506  
    10281028       
    10291029      if (preg_match('/Asterisk (\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) { 
    1030         return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[4]); 
     1030        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[4], 'raw' => $verinfo); 
    10311031      } elseif (preg_match('/Asterisk SVN-(\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) { 
    1032         return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[4]); 
     1032        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[4], 'raw' => $verinfo); 
    10331033      } elseif (preg_match('/Asterisk SVN-branch-(\d+(\.\d+)*)-r(-?(\S*))/', $verinfo, $matches)) { 
    1034         return array('engine'=>'asterisk', 'version' => $matches[1].'.'.$matches[4], 'additional' => $matches[4]); 
     1034        return array('engine'=>'asterisk', 'version' => $matches[1].'.'.$matches[4], 'additional' => $matches[4], 'raw' => $verinfo); 
    10351035      } elseif (preg_match('/Asterisk SVN-trunk-r(-?(\S*))/', $verinfo, $matches)) { 
    1036         return array('engine'=>'asterisk', 'version' => '1.6', 'additional' => $matches[1]); 
     1036        return array('engine'=>'asterisk', 'version' => '1.6', 'additional' => $matches[1], 'raw' => $verinfo); 
    10371037      } elseif (preg_match('/Asterisk SVN-.+-(\d+(\.\d+)*)-r(-?(\S*))-(.+)/', $verinfo, $matches)) { 
    1038         return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[3]); 
    1039       } 
    1040  
    1041       return array('engine'=>'ERROR-UNABLE-TO-CONNECT', 'version'=>'0', 'additional' => '0'); 
     1038        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[3], 'raw' => $verinfo); 
     1039      } 
     1040 
     1041      return array('engine'=>'ERROR-UNABLE-TO-CONNECT', 'version'=>'0', 'additional' => '0', 'raw' => $verinfo); 
    10421042    break; 
    10431043  } 
    1044   return array('engine'=>'ERROR-UNSUPPORTED-ENGINE-'.$amp_conf['AMPENGINE'], 'version'=>'0', 'additional' => '0'); 
     1044  return array('engine'=>'ERROR-UNSUPPORTED-ENGINE-'.$amp_conf['AMPENGINE'], 'version'=>'0', 'additional' => '0', 'raw' => $verinfo); 
    10451045} 
    10461046