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

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

Revision: 854
          http://cs-project.svn.sourceforge.net/cs-project/?rev=854&view=rev
Author:   crazedsanity
Date:     2008-03-26 19:50:51 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Use new CONFIG_FILE_LOCATION instead of hard-coding the config filename's location.

Modified Paths:
--------------
    trunk/1.2/includes/setup.inc
    trunk/1.2/templates/content/settings/admin.content.tmpl
    trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php

Modified: trunk/1.2/includes/setup.inc
===================================================================
--- trunk/1.2/includes/setup.inc	2008-03-27 02:50:15 UTC (rev 853)
+++ trunk/1.2/includes/setup.inc	2008-03-27 02:50:51 UTC (rev 854)
@@ -9,7 +9,7 @@
  * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/includes/setup.inc $ 
  * Last Updated:::::::: $Date:2007-11-20 11:04:59 -0600 (Tue, 20 Nov 2007) $
  * 
- * TODO: check for the existence of the /lib/config.xml file
+ * TODO: check for the existence of the config file (CONFIG_FILE_LOCATION)
  * TODO: if the config.xml exists, check if the database connection works, and if we can get ANY version data: if so, give fatal message saying it won't work.
  * TODO: if step 2 is re-run, do something to reset the status/accessibility of the other steps.
  */

Modified: trunk/1.2/templates/content/settings/admin.content.tmpl
===================================================================
--- trunk/1.2/templates/content/settings/admin.content.tmpl	2008-03-27 02:50:15 UTC (rev 853)
+++ trunk/1.2/templates/content/settings/admin.content.tmpl	2008-03-27 02:50:51 UTC (rev 854)
@@ -12,7 +12,7 @@
 		<div class="note" style="width:60em"><b>NOTE:</b> You should be <font color="red"><b>absolutely certain</b></font> of the 
 			effects of the changes you make here.  Changing an item to an incorrect value make render the 
 			installation useless.  To rectify a broken configuration, you would need to modify the 
-			<b>/lib/config.xml</b> file manually.</div>
+			<b>{CONFIG_FILE_LOCATION}</b> file manually.</div>
 	</td>
 </tr>
 <tr>

Modified: trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php
===================================================================
--- trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php	2008-03-27 02:50:15 UTC (rev 853)
+++ trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php	2008-03-27 02:50:51 UTC (rev 854)
@@ -39,14 +39,14 @@
 	public function update_config_file() {
 		$fs = new cs_fileSystemClass(dirname(__FILE__) .'/../');
 		$sampleXmlObj = new XMLParser($fs->read('docs/samples/sample_config.xml'));
-		$siteXmlObj = new XMLParser($fs->read('lib/config.xml'));
+		$siteXmlObj = new XMLParser($fs->read(CONFIG_FILE_LOCATION));
 		
 		$updateXml = new xmlCreator();
 		$updateXml->load_xmlparser_data($siteXmlObj);
 		
 		
 		//BACKUP ORIGINAL XML CONFIG...
-		$backupFile = 'lib/__BACKUP__'. time() .'__config.xml';
+		$backupFile = 'lib/__BACKUP__'. time() .'__'. CONFIG_FILENAME;
 		$fs->create_file($backupFile);
 		$fs->openFile($backupFile);
 		$fs->write($updateXml->create_xml_string());
@@ -77,7 +77,7 @@
 		}
 		
 		$this->gfObj->debug_print($this->gfObj->cleanString($updateXml->create_xml_string(), 'htmlentity_plus_brackets'));
-		$fs->openFile('lib/config.xml');
+		$fs->openFile(CONFIG_FILE_LOCATION);
 		$fs->write($updateXml->create_xml_string());
 	}//end update_config_file()
 	//=========================================================================


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