removed: ezn patterns for rawcontent and ajaxcontent:
index_rawcontent.html, index_ajaxcontent.html now we have out_streams in Request and some special keyword in ezc templates for sending content to the specified streams changed: the way how winix answers to the client's browsers: info from Request class: winix answer send to the client's browser | | depending on send_bin_stream ------------------------------------------------- | | text answer binary answer | | depending on return_json sending out_bin_stream ------------------------------------ | | normal request ajax request | | sending out_streams[0] depending on return_info_only ------------------------------------------------------ | | generating JSON object from: generating JSON object only from info out_streams and info, e.g.: e.g.: { { info object serialized here } "stream_1": "some html content", "stream_2": "some other html content", "info": { info object serialized here } } note that out_streams[0] is not sent in JSON answers git-svn-id: svn://ttmath.org/publicrep/winix/trunk@937 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
* This file is a part of Winix
|
||||
* and is not publicly distributed
|
||||
*
|
||||
* Copyright (c) 2010, Tomasz Sowa
|
||||
* Copyright (c) 2010-2013, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
*/
|
||||
@@ -11,7 +11,7 @@
|
||||
#define headerfile_winix_functions_upload
|
||||
|
||||
#include "functionbase.h"
|
||||
|
||||
#include "space/spacetojson.h"
|
||||
|
||||
|
||||
namespace Fun
|
||||
@@ -35,6 +35,13 @@ private:
|
||||
DbItemQuery query;
|
||||
bool is_jquery_upload;
|
||||
|
||||
// this object is used in App at the end of a request
|
||||
// for serializing Request::info to JSON
|
||||
// this will make a problem if in the future we'll use multithread requests
|
||||
PT::SpaceToJSON json_serializer;
|
||||
|
||||
void Init();
|
||||
|
||||
bool HasAccess(const Item & item);
|
||||
bool UploadSaveStaticFile(const Item & item, const std::wstring & tmp_filename);
|
||||
bool FunUploadCheckAbuse();
|
||||
@@ -42,7 +49,7 @@ private:
|
||||
void UploadSingle();
|
||||
void ResizeImage(Item & item);
|
||||
void CreateThumb(Item & item);
|
||||
void CreateJSON();
|
||||
void CreateAnswer();
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user