easymod-cvs

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

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

Modified Files:
	admin_easymod.php.txt 
Log Message:
- fixed a few bugs in the modx parsing routines

Index: admin_easymod.php.txt
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** admin_easymod.php.txt	22 Feb 2007 03:32:20 -0000	1.51
--- admin_easymod.php.txt	8 Feb 2008 19:26:44 -0000	1.52
***************
*** 412,416 ****
  	global $phpbb_root_path, $script_path;
  
! 	$modx = new mod_parser_xml(implode("\n", file($file)));
  	$modx->parse_header();
  	
--- 412,416 ----
  	global $phpbb_root_path, $script_path;
  
! 	$modx = new mod_parser_xml(implode("", file($file)));
  	$modx->parse_header();
  	
***************
*** 1866,1870 ****
  	if ($mod_type == MODX)
  	{
! 		$modx = new mod_parser_xml(implode("\n", file($install_path . $install_file)));
  		
  		$modx->parse_actions();
--- 1866,1870 ----
  	if ($mod_type == MODX)
  	{
! 		$modx = new mod_parser_xml(implode('', file($install_path . $install_file)));
  		
  		$modx->parse_actions();
***************
*** 1909,1913 ****
  					
  					$commands[] = array('command' => $current_command, 'line' => $edit_actions[$j]['line']);
! 					$body[] = $code;
  				}
  				
--- 1909,1913 ----
  					
  					$commands[] = array('command' => $current_command, 'line' => $edit_actions[$j]['line']);
! 					$body[] = $code."\n";
  				}
  				
***************
*** 1974,1982 ****
  							$commands[] = array('command' => 'OPEN', 'line'	=> 0);
  							$body[] = array($file);
! 						
  							for($i = 0, $total = sizeof($actions['edit']); $i < $total; $i++)
  							{
  								$commands[] = array('command' => 'FIND', 'line' => 0);
! 								$body[] = explode("\n", $actions['edit'][$i]['find']);
  								
  								$edit_actions = $actions['edit'][$i]['action'];
--- 1974,1989 ----
  							$commands[] = array('command' => 'OPEN', 'line'	=> 0);
  							$body[] = array($file);
! 
  							for($i = 0, $total = sizeof($actions['edit']); $i < $total; $i++)
  							{
  								$commands[] = array('command' => 'FIND', 'line' => 0);
! 
! 								$temp = explode("\n", $actions['edit'][$i]['find']);
! 								for ($j = 0; $j < count($temp); $j++)
! 								{
! 									$temp[$j].= "\n";
! 								}
! 
! 								$body[] = $temp;
  								
  								$edit_actions = $actions['edit'][$i]['action'];
***************
*** 1984,1990 ****
  								{
  									$code = explode("\n", $edit_actions[$j]['code']);
  									for($k = 0, $total3 = sizeof($code); $k < $total3; $k++)
  									{
! 										$code[$k] = rtrim($code[$k]) . "\n";
  									}
  									
--- 1991,1998 ----
  								{
  									$code = explode("\n", $edit_actions[$j]['code']);
+ 
  									for($k = 0, $total3 = sizeof($code); $k < $total3; $k++)
  									{
! 										$code[$k] = rtrim($code[$k]). "\n";
  									}