diff -Naur powl-0.9/config.inc.php-dist powl-0.9.fhs/config.inc.php-dist --- powl-0.9/config.inc.php-dist 2004-12-21 13:08:08.000000000 +0100 +++ powl-0.9.fhs/config.inc.php-dist 2005-06-27 14:01:28.714659576 +0200 @@ -1,6 +1,5 @@ <? -// copy this file to config.inc.php and adjust the database -// connection parameters according to your needs +// adjust the database connection parameters according to your needs $_POWL['db']=array( 'backend'=>'rap', // specifies the backend table layout // 'rap' and 'protege' currently supported diff -Naur powl-0.9/doc/examples/4_owlwidgets.php powl-0.9.fhs/doc/examples/4_owlwidgets.php --- powl-0.9/doc/examples/4_owlwidgets.php 2004-11-25 22:50:00.000000000 +0100 +++ powl-0.9.fhs/doc/examples/4_owlwidgets.php 2005-06-27 14:01:28.714659576 +0200 @@ -22,7 +22,7 @@ <?php // for security reasons this example is only working when -// "$_POWL['deactivateLogin']" is set to true in "config.inc.php" +// "$_POWL['deactivateLogin']" is set to true in "/etc/powl.conf" // and the system ontology is loaded correctly if($_POWL['deactivateLogin'] && !$_SESSION['_ETS']['model']) $_SESSION['_ETS']['model']=$powl->SysOnt->modelURI; diff -Naur powl-0.9/doc/index.php powl-0.9.fhs/doc/index.php --- powl-0.9/doc/index.php 2004-09-26 18:29:06.000000000 +0200 +++ powl-0.9.fhs/doc/index.php 2005-06-27 14:01:28.714659576 +0200 @@ -58,7 +58,7 @@ <li><b>Multi language support.</b> POWL comes with English and German translations of the user interface. If you would like to provide a translation please contact us!</li> <li><b>Easy deployment.</b> Just extract the pOWL distribution to a PHP enabled webspace and adjust -database connection parameters in "config.inc.php".</li></ul> +database connection parameters in "/etc/powl.conf".</li></ul> You miss a feature? Please submit a feature request at the <a href="http://sourceforge.net/projects/powl">Sourceforge Project Page</a>. <? include('footer.php'); ?> \ No newline at end of file diff -Naur powl-0.9/include.php powl-0.9.fhs/include.php --- powl-0.9/include.php 2005-06-23 16:46:26.000000000 +0200 +++ powl-0.9.fhs/include.php 2005-06-27 14:01:28.714659576 +0200 @@ -35,9 +35,9 @@ $_POWL['installPath']=str_replace('\\','/',ereg_replace('[/\]include.php$','/',$file)); // load database connection information -if(!is_readable($_POWL['installPath'].'config.inc.php')) - die('<b>pOWL error:</b> Configuration file "'.$_POWL['installPath'].'config.inc.php" not found. Please copy "config.inc.php-dist" to "config.inc.php" and adjust it according to your needs!'); -include($_POWL['installPath'].'config.inc.php'); +if(!is_readable('/etc/powl.conf')) + die('<b>pOWL error:</b> Configuration file "/etc/powl.conf" not found.'); +include('/etc/powl.conf'); // start session @session_start(); diff -Naur powl-0.9/modules/models/index.php powl-0.9.fhs/modules/models/index.php --- powl-0.9/modules/models/index.php 2005-03-16 21:54:24.000000000 +0100 +++ powl-0.9.fhs/modules/models/index.php 2005-06-27 14:02:30.782554293 +0200 @@ -26,7 +26,7 @@ $m->dontCheckForDuplicatesOnAdd=true; $_ET['store']->dbConn->StartTrans(); #ob_start(); // prevent RAP warnings - $m->load($_POWL['installPath'].'SysOnt.owl',NULL,true); + $m->load('/usr/share/powl/SysOnt.owl',NULL,true); $_ET['store']->dbConn->CompleteTrans(); #ob_end_clean(); } @@ -132,4 +132,4 @@ <? } } pwlHTMLFooter(); -?> \ No newline at end of file +?> diff -Naur powl-0.9/modules/webservice/include.php powl-0.9.fhs/modules/webservice/include.php --- powl-0.9/modules/webservice/include.php 2004-10-21 21:29:00.000000000 +0200 +++ powl-0.9.fhs/modules/webservice/include.php 2005-06-27 14:01:28.715659606 +0200 @@ -41,7 +41,7 @@ // include functions for the webservice include_once('functions.inc.php'); // automatic evaluation of technology (pear,nusoap,...) - include_once('config.inc.php'); + include_once('/etc/powl.config'); if (!$forceToUse) { if ((file_exists_incpath('SOAP/Client.php'))&&(file_exists_incpath('SOAP/Server.php'))) {