openrat-cms

commit 36b5ae1aabd7f995011cf4892eaf512ab37d46c3
parent 2402395f218757882e6af9cbde407e677379221b
Author: dankert <devnull@localhost>
Date:   Wed, 24 Oct 2007 23:42:27 +0200

Korrektur URL f?r FCKEditor, wenn ?ber Vhost gestartet.

Diffstat:
do.php
 | 
10
++++++----
themes/default/include/html/editor.inc.php
 | 
2
+-

2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/do.php b/do.php
@@ -18,13 +18,16 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
-
+
+
 define('PHP_EXT'         ,'php'    );
+require_once( "functions/common.inc.".PHP_EXT );
+
 define('IMG_EXT'         ,'.gif'   );
 define('IMG_ICON_EXT'    ,'.png'   );
 define('MAX_FOLDER_DEPTH',5        );
 
-define('OR_VERSION'      ,'0.8-beta1'  );
+define('OR_VERSION'      ,'0.8-beta2'  );
 define('OR_TITLE'        ,'OpenRat CMS');
 
 define('OR_TYPE_PAGE'  ,'page'  );
@@ -43,7 +46,7 @@ define('OR_TEXTCLASSES_DIR'   ,'./textClasses/'    );
 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_THEMES_EXT_DIR'    ,defined('OR_BASE_URL')?slashify(OR_BASE_URL).'themes/':OR_THEMES_DIR);
 define('OR_TMP_DIR'           ,'./tmp/'            );
 define('OR_CONTROLLER_FILE'   ,defined('OR_EXT_CONTROLLER_FILE')?OR_EXT_CONTROLLER_FILE:'do');
 define('START_TIME'           ,time()              );
@@ -138,7 +141,6 @@ require_once( "functions/config.inc.php" );
 require_once( "functions/language.inc.".PHP_EXT );
 require_once( "functions/theme.inc.".PHP_EXT );
 require_once( "functions/db.inc.".PHP_EXT );
-require_once( "functions/common.inc.".PHP_EXT );
 
 header( 'Content-Type: text/html; charset='.lang('CHARSET') );
 
diff --git a/themes/default/include/html/editor.inc.php b/themes/default/include/html/editor.inc.php
@@ -4,7 +4,7 @@ if	($attr_type=='fckeditor' || $attr_type=='html')
 {
 	include('./editor/fckeditor.php');
 	$editor = new FCKeditor( $attr_name ) ;
-	$editor->BasePath	= './editor/';
+	$editor->BasePath	= defined('OR_BASE_URL')?slashify(OR_BASE_URL).'editor/':'./editor/';
 	$editor->Value = $$attr_name;
 	$editor->Height = '290';
 	$editor->Config['CustomConfigurationsPath'] = '../openrat-fckconfig.js';