openrat-cms

commit b858c252e1b6d56e4108f8f61aa7e5dd23bd6911
parent 2c1ed59a0d442c757435faf9a92334f18fdc499e
Author: dankert <devnull@localhost>
Date:   Mon,  4 Jun 2007 22:58:35 +0200

M?glichkeit f?r Virtual Hosts mit eigener Konfiguration.

Diffstat:
actionClasses/Action.class.php
 | 
19
++++++++-----------
do.php
 | 
7
++++---
serviceClasses/Html.class.php
 | 
7
++++++-

3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/actionClasses/Action.class.php b/actionClasses/Action.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.32  2007-06-04 20:58:35  dankert
+// M?glichkeit f?r Virtual Hosts mit eigener Konfiguration.
+//
 // Revision 1.31  2007-05-03 21:18:14  dankert
 // Nicht aktive Men?punkte als inaktiv anzeigen.
 //
@@ -270,19 +273,19 @@ class Action
 		// Setzen einiger Standard-Variablen
 		//
 		$tpl_dir    = OR_THEMES_DIR.$conf['interface']['theme'].'/pages/html/';
-		$image_dir  = OR_THEMES_DIR.$conf['interface']['theme'].'/images/';
+		$image_dir  = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/images/';
 	
 		$user = Session::getUser();
 		
 		if	( strpos($conf['interface']['style']['extend'],'/')===false )
-			$root_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['extend'].'.css';
+			$root_stylesheet = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['extend'].'.css';
 		else
 			$root_stylesheet = $style['extend'];
 			
 		if	( !is_object($user) )
-			$user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['default'].'.css';
+			$user_stylesheet = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/css/'.$conf['interface']['style']['default'].'.css';
 		else
-			$user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$user->style.'.css';
+			$user_stylesheet = OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/css/'.$user->style.'.css';
 		
 		$self = $HTTP_SERVER_VARS['PHP_SELF'];
 	
@@ -295,13 +298,10 @@ class Action
 
 		$showDuration = $conf['interface']['show_duration'];
 
-		$view = new Html(); // HTML ist der Standard-Renderer
-	
 		$subActionName = $this->subActionName;
 		$actionName    = $this->actionName;
 		$requestId     = $this->getRequestId();
 		
-		
 		if	( $conf['theme']['compiler']['enable'] )
 		{
 			$te = new TemplateEngine();
@@ -310,10 +310,7 @@ class Action
 		}
 
 		// Einbinden des Templates
-		//
-//		$tplFilename = 'themes/default/templates/'.$tplFileName;
-		
-		require( 'themes/default/pages/html/'.$tplName.'.tpl.'.PHP_EXT );
+		require( $tpl_dir.$tplFileName );
 		
 		exit;
 	}
diff --git a/do.php b/do.php
@@ -23,7 +23,6 @@ define('PHP_EXT'         ,'php'    );
 define('IMG_EXT'         ,'.gif'   );
 define('IMG_ICON_EXT'    ,'.png'   );
 define('MAX_FOLDER_DEPTH',5        );
-define('OR_CONFIG_DIR'   ,'config' );
 
 define('OR_VERSION'      ,'0.7-beta1'  );
 define('OR_TITLE'        ,'OpenRat CMS');
@@ -41,10 +40,12 @@ define('OR_LANGUAGE_DIR'      ,'./language/'       );
 define('OR_DBCLASSES_DIR'     ,'./db/'             );
 define('OR_DYNAMICCLASSES_DIR','./dynamicClasses/' );
 define('OR_TEXTCLASSES_DIR'   ,'./textClasses/'    );
-define('OR_PREFERENCES_DIR'   ,'./config/'         );
+define('OR_PREFERENCES_DIR'   ,defined('OR_EXT_CONFIG_DIR')?OR_EXT_CONFIG_DIR:'./config/');
+define('OR_CONFIG_DIR'        ,OR_PREFERENCES_DIR  );
 define('OR_THEMES_DIR'        ,'./themes/'         );
+define('OR_THEMES_EXT_DIR'    ,defined('OR_BASE_URL')?OR_BASE_URL.'/themes/':OR_THEMES_DIR);
 define('OR_TMP_DIR'           ,'./tmp/'            );
-define('OR_CONTROLLER_FILE'   ,'do'                );
+define('OR_CONTROLLER_FILE'   ,defined('OR_EXT_CONTROLLER_FILE')?OR_EXT_CONTROLLER_FILE:'do');
 define('START_TIME'           ,time()              );
 
 require_once( OR_SERVICECLASSES_DIR."include.inc.".PHP_EXT );
diff --git a/serviceClasses/Html.class.php b/serviceClasses/Html.class.php
@@ -106,10 +106,15 @@ class Html
 			$urlParameter = '';
 		}
 
+		if	( @$conf['interface']['url']['index'] )
+			$controller_file_name = '';
+		else
+			$controller_file_name = OR_CONTROLLER_FILE.'.'.PHP_EXT;
+			
 		if	( $fake_urls )
 			$src = sprintf( $url_format,$action,$subaction,$id,session_id() ).$urlParameter;
 		else
-			$src = './'.OR_CONTROLLER_FILE.'.'.PHP_EXT.$urlParameter;
+			$src = './'.$controller_file_name.$urlParameter;
 
 		return $src;
 	}