some work on integrating ckeditor4

added ezc blocks: ckeditor_old_browsers_support, ckeditor, ckeditor_small
defined in ckeditor.html



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1109 e52654a7-88a9-db11-a3e9-0013d4bc506e

winixd/functions/emacs.cpp

@@ -105,9 +105,12 @@ return true;
 
 // !! zmienic nazwy 
 // albo w ogole te metody nie sa potrzebne teraz (byly zmiany)
-void Emacs::PostFunEmacsModifyMountPoint(bool adding)
+void Emacs::DoRedirectIfNeeded(bool adding)
 {
-	system->RedirectTo(cur->request->item);
+	if( cur->request->ParamValue(L"reqtype") != L"json" )
+	{
+		system->RedirectTo(cur->request->item);
+	}
 }
 
 
@@ -166,13 +169,19 @@ void Emacs::MakePost()
 
 	if( cur->request->status == WINIX_ERR_OK )
 	{
-		PostFunEmacsModifyMountPoint(adding);
+		DoRedirectIfNeeded(adding);
 		functions->CheckSpecialFile(cur->request->item);
 	}
 	else
 	{
 		log << log1 << "Emacs: error: "	<< cur->request->status << logend;
 	}
+
+
+	if( cur->request->ParamValue(L"reqtype") == L"json" )
+	{
+		cur->request->info.Add(L"status", cur->request->status);
+	}
 }
 
 

winixd/functions/emacs.h

@@ -57,7 +57,7 @@ private:
 
 	bool HasAccess(const Item & item); // !! takie funkcje to nie powinny byc skladowe modelu?
 	bool PostEmacsCheckAbuse(bool adding);
-	void PostFunEmacsModifyMountPoint(bool adding);
+	void DoRedirectIfNeeded(bool adding);
 	int NotifyCodeEdit();
 	int NotifyCodeAdd();