[Phpbbproject-svn] SF.net SVN: phpbbproject:[282] trunk

[<lor...@us...>]

Revision: 282
          http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=282&view=rev
Author:   lord_le_brand
Date:     2008-07-21 20:16:03 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
Update to MODX 1.2.0 (Might be unfinished?)

Modified Paths:
--------------
    trunk/develop/todo_list.txt
    trunk/phpbb3/root/includes/sources_project/import_project.php

Modified: trunk/develop/todo_list.txt
===================================================================
--- trunk/develop/todo_list.txt	2008-05-06 01:36:46 UTC (rev 281)
+++ trunk/develop/todo_list.txt	2008-07-21 20:16:03 UTC (rev 282)
@@ -1,6 +1,5 @@
 Todo list for phpBB Project
 
-- Add /languages and /templates support to download (and import) class
 - Author ordering in MOD(X) file/project overview page
 - Definitive decision on storing versioned files
 - Generate filetree more efficiently (download class)

Modified: trunk/phpbb3/root/includes/sources_project/import_project.php
===================================================================
--- trunk/phpbb3/root/includes/sources_project/import_project.php	2008-05-06 01:36:46 UTC (rev 281)
+++ trunk/phpbb3/root/includes/sources_project/import_project.php	2008-07-21 20:16:03 UTC (rev 282)
@@ -57,7 +57,7 @@
 			'project_title'				=> $this->parser->mod_title,
 			'project_description'		=> $this->parser->mod_description,
 			'project_notes'				=> $this->parser->author_notes,
-			'project_target_version'	=> serialize($this->parser->target_version_p),
+			'project_target_version'	=> $this->parser->target_version,
 			'project_version'			=> $this->parser->mod_version,
 			'file_only'					=> 0,
 		));
@@ -249,25 +249,19 @@
 	 */
 	protected function process_history()
 	{
-		$stages = array(
-			'alpha'				=> PROJECT_STAGE_ALPHA,
-			'beta'				=> PROJECT_STAGE_BETA,
-			'release-candidate'	=> PROJECT_STAGE_RC,
-			'gamma'				=> PROJECT_STAGE_RC,
-			'delta'				=> PROJECT_STAGE_RC,
-			'stable'			=> PROJECT_STAGE_STABLE,
-			''					=> PROJECT_STAGE_DEV,
-		);
-
 		for ($i = 0, $size = sizeof($this->parser->mod_history); $i < $size; $i++)
 		{
+			$version = $this->parser->mod_history[$i]['version'];
+			preg_match('#(\d+)\.(\d+)\.(\d+)([a-z]?)#', $version, $matches);
+
+
 			$this->history[] = array(
 				'version_time'		=> $this->parser->mod_history[$i]['time'],
-				'version_major'		=> $this->parser->mod_history[$i]['version_p'][0],
-				'version_minor'		=> $this->parser->mod_history[$i]['version_p'][1],
-				'version_revision'	=> $this->parser->mod_history[$i]['version_p'][2],
-				'version_release'	=> $this->parser->mod_history[$i]['version_p'][3],
-				'version_stage'		=> $stages[$this->parser->mod_history[$i]['stage']],
+				'version_major'		=> $matches[1],
+				'version_minor'		=> $matches[2],
+				'version_revision'	=> $matches[3],
+				'version_release'	=> $matches[4],
+				'version_version'	=> $version,
 				'version_changelog'	=> implode("\n", $this->parser->mod_history[$i]['changelog']),
 			);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.