Changeset 4105
- Timestamp:
- 06/21/07 09:25:19 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php
r4063 r4105 1338 1338 switch ($type) { 1339 1339 case 'version': 1340 if (preg_match('/^(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d (\.\d)*)$/i', $value, $matches)) {1340 if (preg_match('/^(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d+(\.[^\.]+)*)$/i', $value, $matches)) { 1341 1341 // matches[1] = operator, [2] = version 1342 1342 $ver = getversion(); … … 1348 1348 break; 1349 1349 case 'module': 1350 if (preg_match('/^([a-z0-9_]+)(\s+(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d (\.\d)*))?$/i', $value, $matches)) {1350 if (preg_match('/^([a-z0-9_]+)(\s+(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d+(\.[^\.]+)*))?$/i', $value, $matches)) { 1351 1351 // matches[1] = modulename, [3]=comparison operator, [4] = version 1352 1352 $modules = module_getinfo($matches[1]); … … 1401 1401 $engine_dependency = true; 1402 1402 1403 if (preg_match('/^([a-z0-9_]+)(\s+(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d (\.\d)*))?$/i', $value, $matches)) {1403 if (preg_match('/^([a-z0-9_]+)(\s+(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d+(\.[^\.]+)*))?$/i', $value, $matches)) { 1404 1404 // matches[1] = engine, [3]=comparison operator, [4] = version 1405 1405 $operator = (!empty($matches[3]) ? $matches[3] : 'ge'); // default to >=
