[CS-Project-svn_notify] SF.net SVN: cs-project:[955] trunk/1.2

[<cra...@us...>]

Revision: 955
          http://cs-project.svn.sourceforge.net/cs-project/?rev=955&view=rev
Author:   crazedsanity
Date:     2009-02-09 20:38:40 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Fix missing template issue (#253), remove old commented code, cs-content v1.0A8

/includes/content/project/index.inc:
	* remove call to html_file_to_string() for grep's sake.
/includes/extern/helpdesk.inc:
	* remove call to html_file_to_string() for grep's sake.
/lib/config.class.php:
	* convert_to_sections():
		-- remove leading slashes from config vars (#253)
/lib/globalFunctions.php:
	* get_required_external_lib_versions():
		-- update to cs-content v1.0-ALPHA8
	* html_file_to_string():
		-- throw an exception about missing template files instead of setting a 
		message (it can cause misleading messages)(#253).

Modified Paths:
--------------
    trunk/1.2/includes/content/project/index.inc
    trunk/1.2/includes/extern/helpdesk.inc
    trunk/1.2/lib/config.class.php
    trunk/1.2/lib/globalFunctions.php

Modified: trunk/1.2/includes/content/project/index.inc
===================================================================
--- trunk/1.2/includes/content/project/index.inc	2009-02-09 19:13:13 UTC (rev 954)
+++ trunk/1.2/includes/content/project/index.inc	2009-02-09 20:38:40 UTC (rev 955)
@@ -29,7 +29,6 @@
 		}
 		$page->ui->set_cache("expandArr", $expandArr);
 		
-		#$page->change_content(html_file_to_string("modules/project/project_main.tmpl"));
 		$page->set_all_block_rows("content");
 		
 		//set some template vars for the filtering.

Modified: trunk/1.2/includes/extern/helpdesk.inc
===================================================================
--- trunk/1.2/includes/extern/helpdesk.inc	2009-02-09 19:13:13 UTC (rev 954)
+++ trunk/1.2/includes/extern/helpdesk.inc	2009-02-09 20:38:40 UTC (rev 955)
@@ -211,7 +211,6 @@
 		//================================================================================================================
 		$titleSub = "Show All";
 		//change the content of the page properly.
-		#$page->change_content(html_file_to_string("modules/helpdesk/helpdesk_main.tmpl"));
 		$page->set_all_block_rows("content", array("helpdesk_search"));
 		
 		$filterData = $page->ui->get_cache("filter");

Modified: trunk/1.2/lib/config.class.php
===================================================================
--- trunk/1.2/lib/config.class.php	2009-02-09 19:13:13 UTC (rev 954)
+++ trunk/1.2/lib/config.class.php	2009-02-09 20:38:40 UTC (rev 955)
@@ -346,11 +346,11 @@
 		$dataArray['SITE_ROOT']['value'] = '{_DIRNAMEOFFILE_}/..';
 		$dataArray['SITE_ROOT']['attributes']['cleanpath'] = 1;
 		
-		//Set some other special values...
-		{
-			$dataArray['DOCUMENT_ROOT']['value'] = '{/MAIN/SITE_ROOT}';
-			$dataArray['LIBDIR']['value'] = '{/MAIN/SITE_ROOT}/lib';
-			$dataArray['TMPLDIR']['value'] = '{/MAIN/SITE_ROOT}/templates';
+		
+		{//Set some other special values...
+			$dataArray['DOCUMENT_ROOT']['value'] = '{MAIN/SITE_ROOT}';
+			$dataArray['LIBDIR']['value'] = '{MAIN/SITE_ROOT}/lib';
+			$dataArray['TMPLDIR']['value'] = '{MAIN/SITE_ROOT}/templates';
 			$dataArray['SEQ_HELPDESK']['value'] = 'special__helpdesk_public_id_seq';
 			$dataArray['SEQ_PROJECT']['value'] = 'special__project_public_id_seq';
 			$dataArray['SEQ_MAIN']['value'] = 'record_table_record_id_seq';

Modified: trunk/1.2/lib/globalFunctions.php
===================================================================
--- trunk/1.2/lib/globalFunctions.php	2009-02-09 19:13:13 UTC (rev 954)
+++ trunk/1.2/lib/globalFunctions.php	2009-02-09 20:38:40 UTC (rev 955)
@@ -17,7 +17,7 @@
 function get_required_external_lib_versions($projectName=NULL) {
 	//format: {className} => array({projectName} => {exactVersion})
 	$requirements = array(
-		'contentSystem'		=> array('cs-content',		'1.0.0-ALPHA7'),
+		'contentSystem'		=> array('cs-content',		'1.0.0-ALPHA8'),
 		'cs_phpxmlParser'	=> array('cs-phpxml',		'1.0.0-ALPHA4'),
 		'cs_arrayToPath'	=> array('cs-arrayToPath',	'1.0.0')
 	);
@@ -110,12 +110,8 @@
 		cs_debug_backtrace(1);
 		//Could not find the file requested to stringify.
 		//Sending warning to user and logging it.
-
-		set_message(
-			"Warning!",
-			"Could not find all files necessary to create this page.<br>Please call technical support.<BR>\nfile=[". $file ."]",
-			"","status"
-		);
+		
+		throw new exception(__FUNCTION__ .": template file does not exist (". $file ."), output from template_file_exists=(". $filename .")");
 		return(NULL);
 	}
 
@@ -1356,7 +1352,13 @@
 	
 	if(file_exists($filename)) {
 		$retval = $filename;
-	} 
+	}
+	else {
+		
+		$gf = new cs_globalFunctions;
+		$gf->debug_print(__FUNCTION__ .": TMPLDIR=(". $GLOBALS['TMPLDIR'] ."), filename=(". $filename .")");
+		exit;
+	}
 	return($retval);
 }//end template_file_exists()
 //================================================================================================================


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