[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt, 1.56, 1.57

[Jim W. <ter...@us...>]

Update of /cvsroot/easymod/easymod2/mods/easymod/includes
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32352

Modified Files:
	admin_easymod.php.txt 
Log Message:
- fixed bug 1852872 - misidentification of SQL action

Index: admin_easymod.php.txt
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** admin_easymod.php.txt	16 Feb 2008 15:12:42 -0000	1.56
--- admin_easymod.php.txt	16 Feb 2008 21:47:01 -0000	1.57
***************
*** 1687,1691 ****
  	if ($mod_type == MODX)
  	{
! 		$modx = new mod_parser_xml(implode("\n", file($install_path . $install_file)));
  		$modx->_parse();
  		
--- 1687,1691 ----
  	if ($mod_type == MODX)
  	{
! 		$modx = new mod_parser_xml(implode('', file($install_path . $install_file)));
  		$modx->_parse();
  		
***************
*** 1716,1720 ****
  			{
  				// if we find [ and ] and OPEN on this line, then we can be reasonably sure we've got an OPEN command
! 				if ((strstr($buffer, '[')) && (strstr($buffer, ']')) && (strstr($buffer, 'OPEN')))
  				{
  					// get us past any remaining # lines
--- 1716,1720 ----
  			{
  				// if we find [ and ] and OPEN on this line, then we can be reasonably sure we've got an OPEN command
! 				if ((substr($buffer, 0, 2) != '##') && (strstr($buffer, '[')) && (strstr($buffer, ']')) && (strstr($buffer, 'OPEN')))
  				{
  					// get us past any remaining # lines
***************
*** 2086,2090 ****
  	
  				// if we find [ and ] on this line, then we can be reasonably sure it is an action command
! 				if ((strstr($buffer, '[')) && (strstr($buffer, ']')))
  				{
  	
--- 2086,2090 ----
  	
  				// if we find [ and ] on this line, then we can be reasonably sure it is an action command
! 				if ((substr($buffer, 0, 2) != '##') && (strstr($buffer, '[')) && (strstr($buffer, ']')))
  				{