Added a new MOD text template parser and removed the old parser.

Moved the functions for outputing the parser data to a new class.
phpbb · Dec 30, 2009 · 54e57d9 · 54e57d9
1 parent 145f7f1
commit 54e57d9
Show file tree

Hide file tree

Showing 8 changed files with 889 additions and 793 deletions.
diff --git a/constants.php b/constants.php
@@ -21,8 +21,8 @@
 
 define('MOD', 1);
 define('MODX', 2);
-define('MODX_V1', 1);
-define('MODX_V2', 2);
+define('MODX_10', 1);
+define('MODX_12', 2);
 
 define('EASY', 1);
 define('INTERMEDIATE', 2);

diff --git a/functions.php b/functions.php
@@ -294,11 +294,11 @@ function modx_version($xmlns)
 {
 	if(preg_match('#modx\\-1\\.0(\\.\d)*\\.xsd#s', $xmlns))
 	{
-		return(MODX_V1);
+		return(MODX_10);
 	}
 	if(preg_match('#modx\\-1\\.2(\\.\d)\\.xsd#s', $xmlns))
 	{
-		return(MODX_V2);
+		return(MODX_12);
 	}
 	return(false);
 }

diff --git a/index.php b/index.php
@@ -30,7 +30,7 @@
 	{
 		// Lets start with the extension...
 		$extension = strtolower(array_pop(explode('.', $_FILES['upload-file']['name'])));
-		$str = file_get_contents($_FILES['upload-file']['tmp_name'], 0, NULL, 0, 20);
+		$str = file_get_contents($_FILES['upload-file']['tmp_name'], 0, NULL, 0, 200);
 
 		// We'll need to know what kind of file it is
 		$submit_file = get_mod_type($str, $extension);
@@ -56,7 +56,10 @@
 	}
 	else if($submit_file == MOD)
 	{
-		include('./read_mod.php');
+		include('./mod_parser.php');
+		$parser = new mod_parser($modx_data);
+
+		include('./read_modx.php');
 	}
 	else
 	{